aboutsummaryrefslogtreecommitdiff
path: root/arch/x86/kernel/cpu/Makefile
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-08-20 12:05:24 +0200
committerIngo Molnar <mingo@elte.hu>2009-08-20 12:05:24 +0200
commitcbcb340cb6a6f9f32724c90493f509dd41105e20 (patch)
tree18e089ee1c74700e59e668de5aed744b15089586 /arch/x86/kernel/cpu/Makefile
parent78b89ecd731798f2fec8cc26ca90739253cec33c (diff)
parentce2eef33d35cd7b932492b5a81fb0febd2b323cd (diff)
Merge branch 'bugfix' of git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen into x86/urgent
Diffstat (limited to 'arch/x86/kernel/cpu/Makefile')
-rw-r--r--arch/x86/kernel/cpu/Makefile4
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/x86/kernel/cpu/Makefile b/arch/x86/kernel/cpu/Makefile
index 3efcb2b96a1..c1f253dac15 100644
--- a/arch/x86/kernel/cpu/Makefile
+++ b/arch/x86/kernel/cpu/Makefile
@@ -7,6 +7,10 @@ ifdef CONFIG_FUNCTION_TRACER
CFLAGS_REMOVE_common.o = -pg
endif
+# Make sure load_percpu_segment has no stackprotector
+nostackp := $(call cc-option, -fno-stack-protector)
+CFLAGS_common.o := $(nostackp)
+
obj-y := intel_cacheinfo.o addon_cpuid_features.o
obj-y += proc.o capflags.o powerflags.o common.o
obj-y += vmware.o hypervisor.o