diff options
| author | Jan Beulich <JBeulich@novell.com> | 2009-09-04 09:16:22 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-09-20 20:23:37 +0200 |
| commit | 5f68563996e812f9ca35b3939ad2a42e5d254d66 (patch) | |
| tree | 89232c0bd7ef8b32f75a519cfe1ed01abb7c3d2e /arch/x86/kernel/trampoline_32.S | |
| parent | 414128bd33fef3242747154dfa444970bc5caf4c (diff) | |
x86: cpuinit-annotate SMP boot trampolines properly
Add missing annotations, and make use of include/linux/init.h's
macros.
Signed-off-by: Jan Beulich <jbeulich@novell.com>
LKML-Reference: <4AA0E8F60200007800013703@vpn.id2.novell.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel/trampoline_32.S')
| -rw-r--r-- | arch/x86/kernel/trampoline_32.S | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/arch/x86/kernel/trampoline_32.S b/arch/x86/kernel/trampoline_32.S index 66d874e5404..8508237e8e4 100644 --- a/arch/x86/kernel/trampoline_32.S +++ b/arch/x86/kernel/trampoline_32.S @@ -28,16 +28,12 @@ */ #include <linux/linkage.h> +#include <linux/init.h> #include <asm/segment.h> #include <asm/page_types.h> /* We can free up trampoline after bootup if cpu hotplug is not supported. */ -#ifndef CONFIG_HOTPLUG_CPU -.section ".cpuinit.data","aw",@progbits -#else -.section .rodata,"a",@progbits -#endif - +__CPUINITRODATA .code16 ENTRY(trampoline_data) |