summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-07-08 09:35:22 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2009-07-08 09:35:22 -0700
commited7ba2ef09254b2fd9698708b407f4652d26e36a (patch)
treed16ea988b54d906704003ab086498c184afe1a1f /arch
parent4b99d3527041bec1abe9903263a3a1b7d2ba0c4a (diff)
parent886a7a3371da8ee46a13f8e598a536bd8765b837 (diff)
downloadop-kernel-dev-ed7ba2ef09254b2fd9698708b407f4652d26e36a.zip
op-kernel-dev-ed7ba2ef09254b2fd9698708b407f4652d26e36a.tar.gz
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6: PM: Clear -EAGAIN in dpm_prepare x86: Fix resume from suspend when CONFIG_CC_STACKPROTECTOR
Diffstat (limited to 'arch')
-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 de2abbd..a6a198c 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
OpenPOWER on IntegriCloud