aboutsummaryrefslogtreecommitdiffstats
path: root/init
diff options
context:
space:
mode:
Diffstat (limited to 'init')
-rw-r--r--init/main.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/init/main.c b/init/main.c
index 602d724afa5c..71832858c5a2 100644
--- a/init/main.c
+++ b/init/main.c
@@ -24,6 +24,7 @@
24#include <linux/smp_lock.h> 24#include <linux/smp_lock.h>
25#include <linux/initrd.h> 25#include <linux/initrd.h>
26#include <linux/bootmem.h> 26#include <linux/bootmem.h>
27#include <linux/acpi.h>
27#include <linux/tty.h> 28#include <linux/tty.h>
28#include <linux/gfp.h> 29#include <linux/gfp.h>
29#include <linux/percpu.h> 30#include <linux/percpu.h>
@@ -88,11 +89,6 @@ extern void sbus_init(void);
88extern void prio_tree_init(void); 89extern void prio_tree_init(void);
89extern void radix_tree_init(void); 90extern void radix_tree_init(void);
90extern void free_initmem(void); 91extern void free_initmem(void);
91#ifdef CONFIG_ACPI
92extern void acpi_early_init(void);
93#else
94static inline void acpi_early_init(void) { }
95#endif
96#ifndef CONFIG_DEBUG_RODATA 92#ifndef CONFIG_DEBUG_RODATA
97static inline void mark_rodata_ro(void) { } 93static inline void mark_rodata_ro(void) { }
98#endif 94#endif
@@ -654,7 +650,6 @@ asmlinkage void __init start_kernel(void)
654#endif 650#endif
655 page_cgroup_init(); 651 page_cgroup_init();
656 enable_debug_pagealloc(); 652 enable_debug_pagealloc();
657 cpu_hotplug_init();
658 kmemtrace_init(); 653 kmemtrace_init();
659 kmemleak_init(); 654 kmemleak_init();
660 debug_objects_mem_init(); 655 debug_objects_mem_init();