aboutsummaryrefslogtreecommitdiffstats
path: root/arch/i386/kernel/dmi_scan.c
diff options
context:
space:
mode:
authorTolentino, Matthew E <matthew.e.tolentino@intel.com>2006-03-26 04:37:09 -0500
committerLinus Torvalds <torvalds@g5.osdl.org>2006-03-26 11:56:54 -0500
commit23dd842c0033dbb05248c42929c3c526c55386de (patch)
tree997126ad81b01819094fb75ccb1a33c88ace6e17 /arch/i386/kernel/dmi_scan.c
parentb2c99e3c70d77fb194df5aa1642030080d28ea48 (diff)
[PATCH] EFI fixes
Here's a patch that fixes EFI boot for x86 on 2.6.16-rc5-mm3. The off-by-one is admittedly my fault, but the other two fix up the rest. Cc: 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> Cc: "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/kernel/dmi_scan.c')
-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 170d4c9f9bc3..5efceebc48dc 100644
--- a/arch/i386/kernel/dmi_scan.c
+++ b/arch/i386/kernel/dmi_scan.c
@@ -229,7 +229,7 @@ void __init dmi_scan_machine(void)
229 goto out; 229 goto out;
230 230
231 rc = dmi_present(p + 0x10); /* offset of _DMI_ string */ 231 rc = dmi_present(p + 0x10); /* offset of _DMI_ string */
232 iounmap(p); 232 dmi_iounmap(p, 32);
233 if (!rc) 233 if (!rc)
234 return; 234 return;
235 } 235 }