aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLv Zheng <lv.zheng@intel.com>2016-04-10 22:13:27 -0400
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2016-04-18 17:59:09 -0400
commitaf06f8b7a102417e93dc57ee7affb9fedcf5d83f (patch)
tree99f036a7d19bc0cd95a3064c340d507322dbfc47
parent5ae74f2cc2f150c1a5cee54cabbd71dd0661285a (diff)
ACPI / x86: Cleanup initrd related code
In arch/x86/kernel/setup.c, the #ifdef kept for CONFIG_ACPI actually is related to the accessibility of initrd_start/initrd_end, so the stub should be provided from this source file and should only be dependent on CONFIG_BLK_DEV_INITRD. Note that when ACPI=n and BLK_DEV_INITRD=y, early_initrd_acpi_init() is still a stub because of the stub prepared for early_acpi_table_init(). Signed-off-by: Lv Zheng <lv.zheng@intel.com> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
-rw-r--r--arch/x86/kernel/setup.c12
1 files changed, 9 insertions, 3 deletions
diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
index 902a6f7b1c04..c4e7b3991b60 100644
--- a/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
@@ -398,6 +398,11 @@ static void __init reserve_initrd(void)
398 398
399 memblock_free(ramdisk_image, ramdisk_end - ramdisk_image); 399 memblock_free(ramdisk_image, ramdisk_end - ramdisk_image);
400} 400}
401
402static void __init early_initrd_acpi_init(void)
403{
404 early_acpi_table_init((void *)initrd_start, initrd_end - initrd_start);
405}
401#else 406#else
402static void __init early_reserve_initrd(void) 407static void __init early_reserve_initrd(void)
403{ 408{
@@ -405,6 +410,9 @@ static void __init early_reserve_initrd(void)
405static void __init reserve_initrd(void) 410static void __init reserve_initrd(void)
406{ 411{
407} 412}
413static void __init early_initrd_acpi_init(void)
414{
415}
408#endif /* CONFIG_BLK_DEV_INITRD */ 416#endif /* CONFIG_BLK_DEV_INITRD */
409 417
410static void __init parse_setup_data(void) 418static void __init parse_setup_data(void)
@@ -1138,9 +1146,7 @@ void __init setup_arch(char **cmdline_p)
1138 1146
1139 reserve_initrd(); 1147 reserve_initrd();
1140 1148
1141#if defined(CONFIG_ACPI) && defined(CONFIG_BLK_DEV_INITRD) 1149 early_initrd_acpi_init();
1142 early_acpi_table_init((void *)initrd_start, initrd_end - initrd_start);
1143#endif
1144 1150
1145 vsmp_init(); 1151 vsmp_init();
1146 1152