---

yaml --- r: 140453 b: refs/heads/master c: 9b7b89e h: refs/heads/master i: 140451: adb12bd v: v3
git-mirror · Apr 3, 2009 · fd42f76 · fd42f76
1 parent 409436d
commit fd42f76
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6a491e2e3e52a64c6d88a192c56499d931842ac5
+refs/heads/master: 9b7b89efa3bdaceaa2efb93e2d635391835da209
diff --git a/trunk/arch/x86/power/Makefile b/trunk/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