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_64.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_64.S')
| -rw-r--r-- | arch/x86/kernel/trampoline_64.S | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/x86/kernel/trampoline_64.S b/arch/x86/kernel/trampoline_64.S index cddfb8d386b..596d54c660a 100644 --- a/arch/x86/kernel/trampoline_64.S +++ b/arch/x86/kernel/trampoline_64.S @@ -25,14 +25,15 @@ */ #include <linux/linkage.h> +#include <linux/init.h> #include <asm/pgtable_types.h> #include <asm/page_types.h> #include <asm/msr.h> #include <asm/segment.h> #include <asm/processor-flags.h> -.section .rodata, "a", @progbits - +/* We can free up the trampoline after bootup if cpu hotplug is not supported. */ +__CPUINITRODATA .code16 ENTRY(trampoline_data) |