diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-07-08 09:35:22 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-07-08 09:35:22 -0700 |
| commit | ed7ba2ef09254b2fd9698708b407f4652d26e36a (patch) | |
| tree | d16ea988b54d906704003ab086498c184afe1a1f /arch | |
| parent | 4b99d3527041bec1abe9903263a3a1b7d2ba0c4a (diff) | |
| parent | 886a7a3371da8ee46a13f8e598a536bd8765b837 (diff) | |
| download | linux-3.10-ed7ba2ef09254b2fd9698708b407f4652d26e36a.tar.gz linux-3.10-ed7ba2ef09254b2fd9698708b407f4652d26e36a.tar.bz2 linux-3.10-ed7ba2ef09254b2fd9698708b407f4652d26e36a.zip | |
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/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/power/Makefile b/arch/x86/power/Makefile index de2abbd0754..a6a198c3362 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 |