diff --git a/[refs] b/[refs]
index 7947c176f434..ab4100e86807 100644
--- 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
index 9ff4d5b55ad1..58b32db33125 100644
--- 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