Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756881AbZGGGhq (ORCPT ); Tue, 7 Jul 2009 02:37:46 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755318AbZGGGhj (ORCPT ); Tue, 7 Jul 2009 02:37:39 -0400 Received: from lemon.ertos.nicta.com.au ([203.143.174.143]:49573 "EHLO lemon.ken.nicta.com.au" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753934AbZGGGhi (ORCPT ); Tue, 7 Jul 2009 02:37:38 -0400 Date: Tue, 07 Jul 2009 16:37:35 +1000 Message-ID: <87r5wt6lsg.wl%peter@chubb.wattle.id.au> From: Peter Chubb To: sergio@larces.uece.br, linux-kernel@vger.kernel.org CC: akpm@linux-foundation.org User-Agent: Wanderlust/2.14.0 (Africa) SEMI/1.14.6 (Maruoka) FLIM/1.14.9 (=?ISO-8859-4?Q?Goj=F2?=) APEL/10.7 Emacs/22.3 (i486-pc-linux-gnu) MULE/5.0 (SAKAKI) X-Face: GgFg(Z>fx((4\32hvXq<)|jndSniCH~~$D)Ka:P@e@JR1P%Vr}EwUdfwf-4j\rUs#JR{'h# !]])6%Jh~b$VA|ALhnpPiHu[-x~@<"@Iv&|%R)Fq[[,(&Z'O)Q)xCqe1\M[F8#9l8~}#u$S$Rm`S9% \'T@`:&8>Sb*c5d'=eDYI&GF`+t[LfDH="MP5rwOO]w>ALi7'=QJHz&y&C&TE_3j! Organization: National ICT Australia MIME-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") Content-Type: text/plain; charset=US-ASCII X-SA-Exim-Connect-IP: 220.237.27.181 X-SA-Exim-Mail-From: peter.chubb@nicta.com.au Subject: [PATCH] fix resume from suspend when CONFIG_CC_STACKPROTECTOR X-SA-Exim-Version: 4.2.1 (built Wed, 25 Jun 2008 17:20:11 +0000) X-SA-Exim-Scanned: Yes (on lemon.ken.nicta.com.au) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1536 Lines: 36 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. Signed-off-by: Peter Chubb --- arch/x86/power/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Index: linux-2.6/arch/x86/power/Makefile =================================================================== --- linux-2.6.orig/arch/x86/power/Makefile 2009-07-07 13:39:54.000000000 +1000 +++ linux-2.6/arch/x86/power/Makefile 2009-07-07 13:40:14.000000000 +1000 @@ -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 -- Dr Peter Chubb peter DOT chubb AT nicta.com.au http://www.ertos.nicta.com.au ERTOS within National ICT Australia All things shall perish from under the sky/Music alone shall live, never to die -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/