Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Peter Chubb and committed by
Rafael J. Wysocki
00024be9 faf80d62

+1 -1
+1 -1
arch/x86/power/Makefile
··· 1 1 # __restore_processor_state() restores %gs after S3 resume and so should not 2 2 # itself be stack-protected 3 3 nostackp := $(call cc-option, -fno-stack-protector) 4 - CFLAGS_cpu_$(BITS).o := $(nostackp) 4 + CFLAGS_cpu.o := $(nostackp) 5 5 6 6 obj-$(CONFIG_PM_SLEEP) += cpu.o 7 7 obj-$(CONFIG_HIBERNATION) += hibernate_$(BITS).o hibernate_asm_$(BITS).o