diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-12-12 11:53:43 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-12-12 11:53:43 +0100 |
| commit | e18d7af85296cb6999aae171e8a9f8612bea5ae0 (patch) | |
| tree | 97a675ecc17bef2f710c50f5ea2a480df0e362c0 /arch/x86/kernel/es7000_32.c | |
| parent | 3555105333ae55414d0fe051557bd7dc590f5255 (diff) | |
| parent | 8b1fae4e4200388b64dd88065639413cb3f1051c (diff) | |
| download | linux-e18d7af85296cb6999aae171e8a9f8612bea5ae0.tar.gz | |
Merge commit 'v2.6.28-rc8' into x86/mm
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 f454c78fcef6..0aa2c443d600 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 |