x86: check dsdt before find oem table for es7000
PATCH 1/1 x86: check dsdt before find oem table for es7000
Signed-off-by Yinghai Lu <[email protected]>
--- arch/x86/mach-generic/es7000.c | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-)
arch/x86/mach-generic/es7000.c +17 -5
@@ -47,16 +47,28 @@ static __init int mps_oem_check(struct m/* Hook from generic ACPI tables.c */ static int __init acpi_madt_oem_check (char *oem_id,char *oem_table_id) { -unsigned long oem_addr; +unsigned long oem_addr =0 ; +int check_dsdt; +int ret =0 ; + +/* check dsdt at first to avoid clear fix_map for oem_addr */ + check_dsdt =es7000_check_dsdt (); +if (!find_unisys_acpi_oem_table (&oem_addr)) { -if (es7000_check_dsdt ()) -return parse_unisys_oem ((char *)oem_addr); +if (check_dsdt) + ret =parse_unisys_oem ((char *)oem_addr);else {setup_unisys (); -return 1 ; + ret =1 ; } +/* +* we may need to unmap it, if we have __acpi_unmap_table() +*/ +#if 0 +unmap_unisys_acpi_oem_table (oem_addr); +#endif } -return 0 ; +return ret; }#else static int __init acpi_madt_oem_check (char *oem_id,char *oem_table_id)