summaryrefslogtreecommitdiffstats
path: root/drivers/char
diff options
context:
space:
mode:
authorDan Williams <dan.j.williams@intel.com>2015-07-30 12:54:40 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-08-05 17:26:00 -0700
commit4816693286d4ff9219b1cc72c2ab9c589448ebcb (patch)
treea2306d47c61d7fea89bd9aad7c1bbd1ab25a4b8a /drivers/char
parent2664e0386e813158b599a73164f8f7ddb2b0eb6d (diff)
downloadlinux-stable-4816693286d4ff9219b1cc72c2ab9c589448ebcb.tar.gz
linux-stable-4816693286d4ff9219b1cc72c2ab9c589448ebcb.tar.bz2
linux-stable-4816693286d4ff9219b1cc72c2ab9c589448ebcb.zip
toshiba laptop: replace ioremap_cache with ioremap
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>
Diffstat (limited to 'drivers/char')
-rw-r--r--drivers/char/toshiba.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/toshiba.c b/drivers/char/toshiba.c
index 014c9d90d297..f5a45d887a37 100644
--- a/drivers/char/toshiba.c
+++ b/drivers/char/toshiba.c
@@ -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;