diff options
| -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) | |||
| 250 | { | 250 | { |
| 251 | struct acpi_table_header *header = NULL; | 251 | struct acpi_table_header *header = NULL; |
| 252 | int i = 0; | 252 | int i = 0; |
| 253 | acpi_size tbl_size; | ||
| 254 | 253 | ||
| 255 | while (ACPI_SUCCESS(acpi_get_table_with_size("OEM1", i++, &header, &tbl_size))) { | 254 | while (ACPI_SUCCESS(acpi_get_table("OEM1", i++, &header))) { |
| 256 | if (!memcmp((char *) &header->oem_id, "UNISYS", 6)) { | 255 | if (!memcmp((char *) &header->oem_id, "UNISYS", 6)) { |
| 257 | struct oem_table *t = (struct oem_table *)header; | 256 | struct oem_table *t = (struct oem_table *)header; |
| 258 | 257 | ||
| 259 | oem_addrX = t->OEMTableAddr; | 258 | oem_addrX = t->OEMTableAddr; |
| 260 | oem_size = t->OEMTableSize; | 259 | oem_size = t->OEMTableSize; |
| 261 | early_acpi_os_unmap_memory(header, tbl_size); | ||
| 262 | 260 | ||
| 263 | *oem_addr = (unsigned long)__acpi_map_table(oem_addrX, | 261 | *oem_addr = (unsigned long)__acpi_map_table(oem_addrX, |
| 264 | oem_size); | 262 | oem_size); |
| 265 | return 0; | 263 | return 0; |
| 266 | } | 264 | } |
| 267 | early_acpi_os_unmap_memory(header, tbl_size); | ||
| 268 | } | 265 | } |
| 269 | return -1; | 266 | return -1; |
| 270 | } | 267 | } |
| 271 | 268 | ||
| 272 | void __init unmap_unisys_acpi_oem_table(unsigned long oem_addr) | 269 | void __init unmap_unisys_acpi_oem_table(unsigned long oem_addr) |
| 273 | { | 270 | { |
| 274 | if (!oem_addr) | ||
| 275 | return; | ||
| 276 | |||
| 277 | __acpi_unmap_table((char *)oem_addr, oem_size); | ||
| 278 | } | 271 | } |
| 279 | #endif | 272 | #endif |
| 280 | 273 | ||
