summaryrefslogtreecommitdiff
path: root/arch/x86/kernel/trampoline.c
diff options
context:
space:
mode:
authorJan Beulich <JBeulich@novell.com>2009-09-04 09:16:22 +0100
committerIngo Molnar <mingo@elte.hu>2009-09-20 20:23:37 +0200
commit5f68563996e812f9ca35b3939ad2a42e5d254d66 (patch)
tree89232c0bd7ef8b32f75a519cfe1ed01abb7c3d2e /arch/x86/kernel/trampoline.c
parent414128bd33fef3242747154dfa444970bc5caf4c (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.c')
-rw-r--r--arch/x86/kernel/trampoline.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/kernel/trampoline.c b/arch/x86/kernel/trampoline.c
index 808031a5ba19..699f7eeb896a 100644
--- a/arch/x86/kernel/trampoline.c
+++ b/arch/x86/kernel/trampoline.c
@@ -4,7 +4,7 @@
#include <asm/e820.h>
/* ready for x86_64 and x86 */
-unsigned char *trampoline_base = __va(TRAMPOLINE_BASE);
+unsigned char *__cpuinitdata trampoline_base = __va(TRAMPOLINE_BASE);
void __init reserve_trampoline_memory(void)
{
@@ -26,7 +26,7 @@ void __init reserve_trampoline_memory(void)
* bootstrap into the page concerned. The caller
* has made sure it's suitably aligned.
*/
-unsigned long setup_trampoline(void)
+unsigned long __cpuinit setup_trampoline(void)
{
memcpy(trampoline_base, trampoline_data, TRAMPOLINE_SIZE);
return virt_to_phys(trampoline_base);