From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from psmtp.com (na3sys010amx146.postini.com [74.125.245.146]) by kanga.kvack.org (Postfix) with SMTP id 791A78D0006 for ; Thu, 8 Aug 2013 04:55:35 -0400 (EDT) From: Tang Chen Subject: [PATCH part3 2/5] x86, acpi: Split acpi_table_init() into two parts. Date: Thu, 8 Aug 2013 16:54:03 +0800 Message-Id: <1375952046-28490-3-git-send-email-tangchen@cn.fujitsu.com> In-Reply-To: <1375952046-28490-1-git-send-email-tangchen@cn.fujitsu.com> References: <1375952046-28490-1-git-send-email-tangchen@cn.fujitsu.com> Sender: owner-linux-mm@kvack.org List-ID: To: robert.moore@intel.com, lv.zheng@intel.com, rjw@sisk.pl, lenb@kernel.org, tglx@linutronix.de, mingo@elte.hu, hpa@zytor.com, akpm@linux-foundation.org, tj@kernel.org, trenn@suse.de, yinghai@kernel.org, jiang.liu@huawei.com, wency@cn.fujitsu.com, laijs@cn.fujitsu.com, isimatu.yasuaki@jp.fujitsu.com, izumi.taku@jp.fujitsu.com, mgorman@suse.de, minchan@kernel.org, mina86@mina86.com, gong.chen@linux.intel.com, vasilis.liaskovitis@profitbricks.com, lwoodman@redhat.com, riel@redhat.com, jweiner@redhat.com, prarit@redhat.com, zhangyanfei@cn.fujitsu.com, yanghy@cn.fujitsu.com Cc: x86@kernel.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org, linux-acpi@vger.kernel.org This patch splits acpi_table_init() into two steps. Since acpi_table_init() is used not just in x86, also used in ia64, we introduce two new functions: acpi_table_init_firmware() and acpi_table_init_override(), which work just the same as acpi_table_init() if they are called in sequence. This will keep acpi_table_init() works as before on other platforms, and we only call these new functions in Linux. Signed-off-by: Tang Chen Reviewed-by: Zhang Yanfei --- drivers/acpi/tables.c | 26 ++++++++++++++++++++------ include/linux/acpi.h | 2 ++ 2 files changed, 22 insertions(+), 6 deletions(-) diff --git a/drivers/acpi/tables.c b/drivers/acpi/tables.c index c8f2d01..4913a85 100644 --- a/drivers/acpi/tables.c +++ b/drivers/acpi/tables.c @@ -336,6 +336,23 @@ static void __init check_multiple_madt(void) return; } +int __init acpi_table_init_firmware(void) +{ + acpi_status status; + + status = acpi_initialize_tables_firmware(initial_tables, + ACPI_MAX_TABLES, 0); + if (ACPI_FAILURE(status)) + return 1; + + return 0; +} + +void __init acpi_table_init_override(void) +{ + acpi_initialize_tables_override(); +} + /* * acpi_table_init() * @@ -347,16 +364,13 @@ static void __init check_multiple_madt(void) int __init acpi_table_init(void) { - acpi_status status; - - status = acpi_initialize_tables_firmware(initial_tables, - ACPI_MAX_TABLES, 0); - if (ACPI_FAILURE(status)) + if (acpi_table_init_firmware()) return 1; - acpi_initialize_tables_override(); + acpi_table_init_override(); check_multiple_madt(); + return 0; } diff --git a/include/linux/acpi.h b/include/linux/acpi.h index 353ba25..9704179 100644 --- a/include/linux/acpi.h +++ b/include/linux/acpi.h @@ -95,6 +95,8 @@ void acpi_boot_table_init (void); int acpi_mps_check (void); int acpi_numa_init (void); +int acpi_table_init_firmware(void); +void acpi_table_init_override(void); int acpi_table_init (void); int acpi_table_parse(char *id, acpi_tbl_table_handler handler); int __init acpi_table_parse_entries(char *id, unsigned long table_size, -- 1.7.1 -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: email@kvack.org