mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-28 02:32:09 -04:00
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 ...
This commit is contained in:
commit
958a2f29a6
20 changed files with 82 additions and 51 deletions
|
|
@ -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;
|
||||
|
|
|
|||
Loading…
Reference in a new issue