summaryrefslogtreecommitdiffstats
path: root/arch/i386
diff options
context:
space:
mode:
authorBjorn Helgaas <bjorn.helgaas@hp.com>2006-03-26 11:37:07 +0200
committerLinus Torvalds <torvalds@g5.osdl.org>2006-03-26 18:56:54 +0200
commit27d8e3d15bcf9d7cd99bf6ca910ea9e34328c7fb (patch)
tree227d271f008fd84d752671d7748c435c4276c542 /arch/i386
parent[PATCH] ia64: ioremap: check EFI for valid memory attributes (diff)
downloadlinux-27d8e3d15bcf9d7cd99bf6ca910ea9e34328c7fb.tar.xz
linux-27d8e3d15bcf9d7cd99bf6ca910ea9e34328c7fb.zip
[PATCH] DMI: only ioremap stuff we actually need
dmi_scan_machine() tries to ioremap 0x10000 (64K) bytes, even though it only looks at the first 32 bytes or so. If the SMBIOS table is near the end of a memory region, the ioremap() may fail when it shouldn't. This is in the efi_enabled path, so it really only affects ia64 at the moment. Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com> Cc: Matt Domsch <Matt_Domsch@dell.com> Cc: "Tolentino, Matthew E" <matthew.e.tolentino@intel.com> Cc: "Brown, Len" <len.brown@intel.com> Cc: Andi Kleen <ak@muc.de> Acked-by: "Luck, Tony" <tony.luck@intel.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/i386')
-rw-r--r--arch/i386/kernel/dmi_scan.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/i386/kernel/dmi_scan.c b/arch/i386/kernel/dmi_scan.c
index bfecbd46f22a..c032f9e06bb6 100644
--- a/arch/i386/kernel/dmi_scan.c
+++ b/arch/i386/kernel/dmi_scan.c
@@ -224,7 +224,7 @@ void __init dmi_scan_machine(void)
* needed during early boot. This also means we can
* iounmap the space when we're done with it.
*/
- p = dmi_ioremap((unsigned long)efi.smbios, 0x10000);
+ p = dmi_ioremap((unsigned long)efi.smbios, 32);
if (p == NULL)
goto out;