Commit 00024be9 authored Jul 08, 2009 by Peter Chubb Committed by Rafael J. Wysocki Jul 08, 2009

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>

parent faf80d62

arch/x86/power/Makefile

+1 −1

Original line number	Original line	Diff line number	Diff line
	# __restore_processor_state() restores %gs after S3 resume and so should not		# __restore_processor_state() restores %gs after S3 resume and so should not
	# itself be stack-protected		# itself be stack-protected
	nostackp := $(call cc-option, -fno-stack-protector)		nostackp := $(call cc-option, -fno-stack-protector)
	CFLAGS_cpu_$(BITS).o := $(nostackp)		CFLAGS_cpu.o := $(nostackp)

	obj-$(CONFIG_PM_SLEEP) += cpu.o		obj-$(CONFIG_PM_SLEEP) += cpu.o
	obj-$(CONFIG_HIBERNATION) += hibernate_$(BITS).o hibernate_asm_$(BITS).o		obj-$(CONFIG_HIBERNATION) += hibernate_$(BITS).o hibernate_asm_$(BITS).o

Admin message