diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-12-01 20:36:13 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-12-01 20:36:13 +0100 |
commit | f6d2e6f57bba66272b28dd20c949b14ce39cb804 (patch) | |
tree | 2bf153af4d5b4b33ad2c1e88347c7fd752fb6332 /arch/x86/kernel/es7000_32.c | |
parent | 8caac56305cef98f9357b060a77939d17699937d (diff) | |
parent | 7b1dedca42ac0d0d0be01e39d8461bb53a2389b3 (diff) |
Merge branch 'x86/urgent' into x86/iommu
Diffstat (limited to 'arch/x86/kernel/es7000_32.c')
-rw-r--r-- | arch/x86/kernel/es7000_32.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/arch/x86/kernel/es7000_32.c b/arch/x86/kernel/es7000_32.c index f454c78fcef..0aa2c443d60 100644 --- a/arch/x86/kernel/es7000_32.c +++ b/arch/x86/kernel/es7000_32.c @@ -250,31 +250,24 @@ int __init find_unisys_acpi_oem_table(unsigned long *oem_addr) { struct acpi_table_header *header = NULL; int i = 0; - acpi_size tbl_size; - while (ACPI_SUCCESS(acpi_get_table_with_size("OEM1", i++, &header, &tbl_size))) { + while (ACPI_SUCCESS(acpi_get_table("OEM1", i++, &header))) { if (!memcmp((char *) &header->oem_id, "UNISYS", 6)) { struct oem_table *t = (struct oem_table *)header; oem_addrX = t->OEMTableAddr; oem_size = t->OEMTableSize; - early_acpi_os_unmap_memory(header, tbl_size); *oem_addr = (unsigned long)__acpi_map_table(oem_addrX, oem_size); return 0; } - early_acpi_os_unmap_memory(header, tbl_size); } return -1; } void __init unmap_unisys_acpi_oem_table(unsigned long oem_addr) { - if (!oem_addr) - return; - - __acpi_unmap_table((char *)oem_addr, oem_size); } #endif |