diff options
author | Tejun Heo <tj@kernel.org> | 2009-07-03 18:13:18 -0400 |
---|---|---|
committer | Tejun Heo <tj@kernel.org> | 2009-07-03 18:13:18 -0400 |
commit | c43768cbb7655ea5ff782ae250f6e2ef4297cf98 (patch) | |
tree | 3982e41dde3eecaa3739a5d1a8ed18d04bd74f01 /init | |
parent | 1a8dd307cc0a2119be4e578c517795464e6dabba (diff) | |
parent | 746a99a5af60ee676afa2ba469ccd1373493c7e7 (diff) |
Merge branch 'master' into for-next
Pull linus#master to merge PER_CPU_DEF_ATTRIBUTES and alpha build fix
changes. As alpha in percpu tree uses 'weak' attribute instead of
inline assembly, there's no need for __used attribute.
Conflicts:
arch/alpha/include/asm/percpu.h
arch/mn10300/kernel/vmlinux.lds.S
include/linux/percpu-defs.h
Diffstat (limited to 'init')
-rw-r--r-- | init/main.c | 7 |
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); | |||
88 | extern void prio_tree_init(void); | 89 | extern void prio_tree_init(void); |
89 | extern void radix_tree_init(void); | 90 | extern void radix_tree_init(void); |
90 | extern void free_initmem(void); | 91 | extern void free_initmem(void); |
91 | #ifdef CONFIG_ACPI | ||
92 | extern void acpi_early_init(void); | ||
93 | #else | ||
94 | static inline void acpi_early_init(void) { } | ||
95 | #endif | ||
96 | #ifndef CONFIG_DEBUG_RODATA | 92 | #ifndef CONFIG_DEBUG_RODATA |
97 | static inline void mark_rodata_ro(void) { } | 93 | static 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(); |