]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
x86: make sure load_percpu_segment has no stackprotector
authorJeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
Mon, 17 Aug 2009 19:25:41 +0000 (12:25 -0700)
committerJeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
Thu, 20 Aug 2009 00:09:21 +0000 (17:09 -0700)
load_percpu_segment() is used to set up the per-cpu segment registers,
which are also used for -fstack-protector.  Make sure that the
load_percpu_segment() function doesn't have stackprotector enabled.

[ Impact: allow percpu setup before calling stack-protected functions ]

Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
arch/x86/kernel/cpu/Makefile

index 4e242f9a06e43a3bc479e40237997b3c0e1a53c4..8b5b9b625ede46b7af40ed0efb9244b604719874 100644 (file)
@@ -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