git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branches 'tracing/ftrace' and 'tracing/hw-branch-tracing' into tracing/core
[safe/jmp/linux-2.6]
/
arch
/
x86
/
kernel
/
trampoline_64.S
diff --git
a/arch/x86/kernel/trampoline_64.S
b/arch/x86/kernel/trampoline_64.S
index
2a07e67
..
894293c
100644
(file)
--- a/
arch/x86/kernel/trampoline_64.S
+++ b/
arch/x86/kernel/trampoline_64.S
@@
-30,12
+30,7
@@
#include <asm/msr.h>
#include <asm/segment.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
.code16