Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6

[linux-2.6-omap-h63xx.git] / arch / x86 / power / Makefile

diff --git a/arch/x86/power/Makefile b/arch/x86/power/Makefile
index 8ce87fb4abb4cbaf9e666321b9e79c0cc611012c..58b32db33125a9eb13cc3859597cfb5b32b2cb4c 100644 (file)
--- a/arch/x86/power/Makefile
+++ b/arch/x86/power/Makefile
@@ -1,7 +1,7 @@
-ifeq ($(CONFIG_X86_64),y)
-        obj-$(CONFIG_PM)               += suspend_64.o
-        obj-$(CONFIG_HIBERNATION)      += hibernate_asm_64.o
-else
-       obj-$(CONFIG_PM)                += cpu.o
-       obj-$(CONFIG_HIBERNATION)       += swsusp.o suspend.o
-endif
+# __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