summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Chubb <peter.chubb@nicta.com.au>2009-07-08 15:20:13 +0400
committerRafael J. Wysocki <rjw@sisk.pl>2009-07-08 15:20:13 +0400
commit00024be9689963c55cf2ab10ce3fb4502016c09a (patch)
treebd672db137500c8760581fe0a31b80f77ba16165
parentfaf80d62e44dc627efb741f48db50c1858d1667c (diff)
downloadlinux-00024be9689963c55cf2ab10ce3fb4502016c09a.tar.xz
x86: Fix resume from suspend when CONFIG_CC_STACKPROTECTOR
Patch 08687aec71bc9134fe336e561f6did877bacf74fc0a (x86: unify power/cpu_(32|64).c) renamed cpu_32.c to cpu.c, but did not update the special compilation flags for the file for the new name. This patch fixes the compilation flags, and therefore fixes resume from suspend on my Acer Aspire One. [rjw: The regression from 2.6.30 fixed by this patch is tracked as http://bugzilla.kernel.org/show_bug.cgi?id=13661] Signed-off-by: Peter Chubb <peterc@nicta.com.au> Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
-rw-r--r--arch/x86/power/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/power/Makefile b/arch/x86/power/Makefile
index de2abbd07544..a6a198c33623 100644
--- a/arch/x86/power/Makefile
+++ b/arch/x86/power/Makefile
@@ -1,7 +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)
+CFLAGS_cpu.o := $(nostackp)
obj-$(CONFIG_PM_SLEEP) += cpu.o
obj-$(CONFIG_HIBERNATION) += hibernate_$(BITS).o hibernate_asm_$(BITS).o