public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Peter Chubb <peter.chubb@nicta.com.au>
To: sergio@larces.uece.br, linux-kernel@vger.kernel.org
Cc: akpm@linux-foundation.org
Subject: [PATCH] fix resume from suspend when CONFIG_CC_STACKPROTECTOR
Date: Tue, 07 Jul 2009 16:37:35 +1000	[thread overview]
Message-ID: <87r5wt6lsg.wl%peter@chubb.wattle.id.au> (raw)


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 <peterc@nicta.com.au>
---
 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

             reply	other threads:[~2009-07-07  6:37 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-07-07  6:37 Peter Chubb [this message]
2009-07-07  8:18 ` [PATCH] fix resume from suspend when CONFIG_CC_STACKPROTECTOR Sergio Luis
2009-07-07 11:30   ` Rafael J. Wysocki
2009-07-07 12:08     ` Thomas Gleixner
2009-07-07 21:15       ` Rafael J. Wysocki

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=87r5wt6lsg.wl%peter@chubb.wattle.id.au \
    --to=peter.chubb@nicta.com.au \
    --cc=akpm@linux-foundation.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=sergio@larces.uece.br \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox