diff options
Diffstat (limited to 'init/main.c')
| -rw-r--r-- | init/main.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/init/main.c b/init/main.c index c691f5f7fc27..2a78932f6c07 100644 --- a/init/main.c +++ b/init/main.c | |||
| @@ -102,6 +102,12 @@ static inline void mark_rodata_ro(void) { } | |||
| 102 | extern void tc_init(void); | 102 | extern void tc_init(void); |
| 103 | #endif | 103 | #endif |
| 104 | 104 | ||
| 105 | #ifdef CONFIG_ACPI_CUSTOM_DSDT_INITRD | ||
| 106 | extern int populate_rootfs(void); | ||
| 107 | #else | ||
| 108 | static inline void populate_rootfs(void) {} | ||
| 109 | #endif | ||
| 110 | |||
| 105 | enum system_states system_state; | 111 | enum system_states system_state; |
| 106 | EXPORT_SYMBOL(system_state); | 112 | EXPORT_SYMBOL(system_state); |
| 107 | 113 | ||
| @@ -648,6 +654,7 @@ asmlinkage void __init start_kernel(void) | |||
| 648 | 654 | ||
| 649 | check_bugs(); | 655 | check_bugs(); |
| 650 | 656 | ||
| 657 | populate_rootfs(); /* For DSDT override from initramfs */ | ||
| 651 | acpi_early_init(); /* before LAPIC and SMP init */ | 658 | acpi_early_init(); /* before LAPIC and SMP init */ |
| 652 | 659 | ||
| 653 | /* Do the rest non-__init'ed, we're now alive */ | 660 | /* Do the rest non-__init'ed, we're now alive */ |
