Merge branch 'omap-pool'

[linux-2.6-omap-h63xx.git] / arch / x86 / power / Makefile

diff --git a/arch/x86/power/Makefile b/arch/x86/power/Makefile
index 9ff4d5b55ad182852ef5c4fd2dbb11a372525275..58b32db33125a9eb13cc3859597cfb5b32b2cb4c 100644 (file)
--- a/arch/x86/power/Makefile
+++ b/arch/x86/power/Makefile
@@ -1,2 +1,7 @@
+# __restore_processor_state() restores %gs after S3 resume and so should not
+# itself be stack-protected
+nostackp := $(call cc-option, -fno-stack-protector)
+CFLAGS_cpu_$(BITS).o   := $(nostackp)
+
 obj-$(CONFIG_PM_SLEEP)         += cpu_$(BITS).o
 obj-$(CONFIG_HIBERNATION)      += hibernate_$(BITS).o hibernate_asm_$(BITS).o