Since we split acpi_table_init() into two steps, and want to do the two steps separately, we need to do check_multiple_madt() after acpi_table_init_override(). But we also have to keep acpi_table_init() as before because it is also used in ia64, we have to do check_multiple_madt() directly in acpi_boot_table_init() in x86. This patch make check_multiple_madt() global, and rename it to acpi_check_multiple_madt() because all interfaces provided by drivers/acpi/tables.c begins with "acpi_". Signed-off-by: Tang Chen <tangchen@xxxxxxxxxxxxxx> Reviewed-by: Zhang Yanfei <zhangyanfei@xxxxxxxxxxxxxx> --- drivers/acpi/tables.c | 4 ++-- include/linux/acpi.h | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/acpi/tables.c b/drivers/acpi/tables.c index 4913a85..45727b2 100644 --- a/drivers/acpi/tables.c +++ b/drivers/acpi/tables.c @@ -314,7 +314,7 @@ int __init acpi_table_parse(char *id, acpi_tbl_table_handler handler) * but some report two. Provide a knob to use either. * (don't you wish instance 0 and 1 were not the same?) */ -static void __init check_multiple_madt(void) +void __init acpi_check_multiple_madt(void) { struct acpi_table_header *table = NULL; acpi_size tbl_size; @@ -369,7 +369,7 @@ int __init acpi_table_init(void) acpi_table_init_override(); - check_multiple_madt(); + acpi_check_multiple_madt(); return 0; } diff --git a/include/linux/acpi.h b/include/linux/acpi.h index 9704179..44a3e5f 100644 --- a/include/linux/acpi.h +++ b/include/linux/acpi.h @@ -95,6 +95,7 @@ void acpi_boot_table_init (void); int acpi_mps_check (void); int acpi_numa_init (void); +void acpi_check_multiple_madt(void); int acpi_table_init_firmware(void); void acpi_table_init_override(void); int acpi_table_init (void); -- 1.7.1 -- To unsubscribe from this list: send the line "unsubscribe linux-doc" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html