diff options
author | Bjorn Helgaas <bjorn.helgaas@hp.com> | 2006-03-26 04:37:07 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-26 11:56:54 -0500 |
commit | 27d8e3d15bcf9d7cd99bf6ca910ea9e34328c7fb (patch) | |
tree | 227d271f008fd84d752671d7748c435c4276c542 | |
parent | e9b0a0712148abe96ff717a2b9f8dab1d433e0d5 (diff) |
[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>
-rw-r--r-- | arch/i386/kernel/dmi_scan.c | 2 |
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) | |||
224 | * needed during early boot. This also means we can | 224 | * needed during early boot. This also means we can |
225 | * iounmap the space when we're done with it. | 225 | * iounmap the space when we're done with it. |
226 | */ | 226 | */ |
227 | p = dmi_ioremap((unsigned long)efi.smbios, 0x10000); | 227 | p = dmi_ioremap((unsigned long)efi.smbios, 32); |
228 | if (p == NULL) | 228 | if (p == NULL) |
229 | goto out; | 229 | goto out; |
230 | 230 | ||