diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-30 19:31:52 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-30 19:31:52 -0700 |
| commit | 958a2f29a6520a1d2973077ce7854ea9a44f48a2 (patch) | |
| tree | 918bc7a850bab351c2a91dbfea66f58d9258495d /drivers | |
| parent | 6de3d58dcfbab516dbe9aff36ea9542f40cd1bf2 (diff) | |
| parent | 895d30935ebe05f192e844792668bf8d19deaae7 (diff) | |
| download | linux-3.10-958a2f29a6520a1d2973077ce7854ea9a44f48a2.tar.gz linux-3.10-958a2f29a6520a1d2973077ce7854ea9a44f48a2.tar.bz2 linux-3.10-958a2f29a6520a1d2973077ce7854ea9a44f48a2.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86-fixes3
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86-fixes3: (21 commits)
x86: numaq fix
x86: 8K stacks by default
x86: ioremap ram check fix
x86: fix HT cpu booting on 32-bit
x86: optimize inlining off
x86: CONFIG_X86_ELAN fix
x86: Kconfig fix
x86 PAT: fix performance drop for glx, use UC minus for ioremap(), ioremap_nocache() and pci_mmap_page_range()
x86: use defconfigs from x86/configs/*
toshiba: use ioremap_cached
revert: "x86: ioremap(), extend check to all RAM pages"
x86: don't bother printing compat vdso address
fix: x86: support for new UV apic
x86: fix early-BUG message
x86: iommu_sac_force can become static
x86: add proper header for reboot_force
x86 VISWS: build fix
x86, voyager: fix ioremap_nocache()
hpet: fix
x86: unexport kmap_atomic_to_page
...
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/char/toshiba.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/toshiba.c b/drivers/char/toshiba.c index 64f1ceed0b2..663cd15d7c7 100644 --- a/drivers/char/toshiba.c +++ b/drivers/char/toshiba.c @@ -426,7 +426,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(0xf0000, 0x10000); + void __iomem *bios = ioremap_cache(0xf0000, 0x10000); if (!bios) return -ENOMEM; |