Re: [PATCH] fix resume from suspend when CONFIG_CC_STACKPROTECTOR

Sergio Luis
2009-07-07T08:18:21Z

Hi,

On Tue, Jul 7, 2009 at 3:37 AM, Peter Chubb<peter.chubb@nicta.com.au> wrote:
>
> 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.
>

yeah, I missed it, sorry for that. Thanks for catching it. CC'ing
Rafael and Ingo, as they will know the best way to push the fix.

> 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
>

Sergio.