toshiba laptop: replace ioremap_cache with ioremap
authorDan Williams <dan.j.williams@intel.com>
Thu, 30 Jul 2015 16:54:40 +0000 (12:54 -0400)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 6 Aug 2015 00:26:00 +0000 (17:26 -0700)
With ioremap_cache being replaced with memremap there is no longer a
guarantee that a mapping will silently fall back to an uncached mapping.
Explicitly use a vanilla ioremap() for this short lived mapping.

Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Jonathan Buzzard <jonathan@buzzard.org.uk>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/char/toshiba.c

index 014c9d9..f5a45d8 100644 (file)
@@ -430,7 +430,7 @@ static int tosh_probe(void)
        int i,major,minor,day,year,month,flag;
        unsigned char signature[7] = { 0x54,0x4f,0x53,0x48,0x49,0x42,0x41 };
        SMMRegisters regs;
-       void __iomem *bios = ioremap_cache(0xf0000, 0x10000);
+       void __iomem *bios = ioremap(0xf0000, 0x10000);
 
        if (!bios)
                return -ENOMEM;