Re: [tip:x86/trampoline] x86, trampoline: Use the unified trampoline setup for ACPI wakeup

From: Rafael J. Wysocki
Date: Wed Mar 09 2011 - 19:08:18 EST


On Wednesday, March 09, 2011, matthieu castet wrote:
> Hi,
>
> tip-bot for H. Peter Anvin a Ãcrit :
> > Commit-ID: d1ee433539ea5963a8f946f3428b335d1c5fdb20
> > Gitweb: http://git.kernel.org/tip/d1ee433539ea5963a8f946f3428b335d1c5fdb20
> > Author: H. Peter Anvin <hpa@xxxxxxxxxxxxxxx>
> > AuthorDate: Mon, 14 Feb 2011 15:42:46 -0800
> > Committer: H. Peter Anvin <hpa@xxxxxxxxxxxxxxx>
> > CommitDate: Thu, 17 Feb 2011 21:05:06 -0800
> >
> > diff --git a/arch/x86/kernel/acpi/wakeup_rm.S b/arch/x86/kernel/acpi/wakeup_rm.S
> > index 6ff3b57..6ce81ee 100644
> > --- a/arch/x86/kernel/acpi/wakeup_rm.S
> > +++ b/arch/x86/kernel/acpi/wakeup_rm.S
> > @@ -2,9 +2,11 @@
> > * Wrapper script for the realmode binary as a transport object
> > * before copying to low memory.
> > */
> > - .section ".rodata","a"
> > - .globl wakeup_code_start, wakeup_code_end
> > -wakeup_code_start:
> > +#include <asm/page_types.h>
> > +
> > + .section ".x86_trampoline","a"
> > + .balign PAGE_SIZE
> > + .globl acpi_wakeup_code
> > +acpi_wakeup_code:
> > .incbin "arch/x86/kernel/acpi/realmode/wakeup.bin"
> > -wakeup_code_end:
> > .size wakeup_code_start, .-wakeup_code_start
> It doesn't build for me, Shouldn't you change this to
> .size acpi_wakeup_code, .-acpi_wakeup_code ?

Yes, and the fix is already in the tip tree.

Thanks,
Rafael
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/