summaryrefslogtreecommitdiff
path: root/arch/x86/kernel/trampoline_64.S
diff options
context:
space:
mode:
authorJan Beulich <jbeulich@novell.com>2007-10-17 18:04:37 +0200
committerThomas Gleixner <tglx@inhelltoy.tec.linutronix.de>2007-10-17 20:16:08 +0200
commit121d7bf5a246d282ba91234d03a4edf9ccc9c940 (patch)
treeea7c5e9da9b3a09e8cc482eab5039986056b841f /arch/x86/kernel/trampoline_64.S
parentdf5ddf620e101f6c7f968c71b327ded16a90ca03 (diff)
x86: misc. constifications
Miscellaneous x86 stuff that can live in .rodata. [ tglx: arch/x86 adaptation ] Signed-off-by: Jan Beulich <jbeulich@novell.com> Signed-off-by: Andi Kleen <ak@suse.de> Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/x86/kernel/trampoline_64.S')
-rw-r--r--arch/x86/kernel/trampoline_64.S7
1 files changed, 6 insertions, 1 deletions
diff --git a/arch/x86/kernel/trampoline_64.S b/arch/x86/kernel/trampoline_64.S
index 607983b0d27b..e30b67c6a9f5 100644
--- a/arch/x86/kernel/trampoline_64.S
+++ b/arch/x86/kernel/trampoline_64.S
@@ -33,7 +33,12 @@
#include <asm/msr.h>
#include <asm/segment.h>
-.data
+/* We can free up trampoline after bootup if cpu hotplug is not supported. */
+#ifndef CONFIG_HOTPLUG_CPU
+.section .init.data, "aw", @progbits
+#else
+.section .rodata, "a", @progbits
+#endif
.code16