aboutsummaryrefslogtreecommitdiffstats
path: root/init/main.c
diff options
context:
space:
mode:
Diffstat (limited to 'init/main.c')
-rw-r--r--init/main.c9
1 files changed, 1 insertions, 8 deletions
diff --git a/init/main.c b/init/main.c
index 8b1982082ad8..99ce94930b09 100644
--- a/init/main.c
+++ b/init/main.c
@@ -102,12 +102,6 @@ static inline void mark_rodata_ro(void) { }
102extern void tc_init(void); 102extern void tc_init(void);
103#endif 103#endif
104 104
105#ifdef CONFIG_ACPI_CUSTOM_DSDT_INITRD
106extern int populate_rootfs(void);
107#else
108static inline void populate_rootfs(void) {}
109#endif
110
111enum system_states system_state; 105enum system_states system_state;
112EXPORT_SYMBOL(system_state); 106EXPORT_SYMBOL(system_state);
113 107
@@ -254,7 +248,7 @@ early_param("quiet", quiet_kernel);
254static int __init loglevel(char *str) 248static int __init loglevel(char *str)
255{ 249{
256 get_option(&str, &console_loglevel); 250 get_option(&str, &console_loglevel);
257 return 1; 251 return 0;
258} 252}
259 253
260early_param("loglevel", loglevel); 254early_param("loglevel", loglevel);
@@ -650,7 +644,6 @@ asmlinkage void __init start_kernel(void)
650 644
651 check_bugs(); 645 check_bugs();
652 646
653 populate_rootfs(); /* For DSDT override from initramfs */
654 acpi_early_init(); /* before LAPIC and SMP init */ 647 acpi_early_init(); /* before LAPIC and SMP init */
655 648
656 /* Do the rest non-__init'ed, we're now alive */ 649 /* Do the rest non-__init'ed, we're now alive */