diff options
| author | Len Brown <len.brown@intel.com> | 2004-08-13 18:32:45 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2004-08-13 18:32:45 -0400 |
| commit | 5fd850a803547db7560e9ba72e8c886d9905d27e (patch) | |
| tree | 72e2973db71bac234c8243068738a6c6ebfe2f55 /init | |
| parent | 858cb35b83cd1c1d473097df893a406148f35914 (diff) | |
| parent | 7a4bd3568f114d5936a3a6836cf1448e1ffa1651 (diff) | |
| download | history-5fd850a803547db7560e9ba72e8c886d9905d27e.tar.gz | |
merge
Diffstat (limited to 'init')
| -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 cafeaeb4e43624..445cd768d34837 100644 --- a/init/main.c +++ b/init/main.c @@ -93,6 +93,11 @@ extern void free_initmem(void); extern void populate_rootfs(void); extern void driver_init(void); extern void prepare_namespace(void); +#ifdef CONFIG_ACPI +extern void acpi_early_init(void); +#else +static inline acpi_early_init() { } +#endif #ifdef CONFIG_TC extern void tc_init(void); @@ -530,6 +535,8 @@ asmlinkage void __init start_kernel(void) #endif check_bugs(); + acpi_early_init(); /* before LAPIC and SMP init */ + /* * We count on the initial thread going ok * Like idlers init is an unlocked kernel thread, which will |