[PATCH] x86: Fix ACPI wakeup build failure

[PATCH] x86: Fix ACPI wakeup build failure

[Sedat Dilek]

This fixes the following breakage in linux-next (next-20110308):
  AS      arch/x86/kernel/acpi/wakeup_rm.o
  arch/x86/kernel/acpi/wakeup_rm.S: Assembler messages:
  arch/x86/kernel/acpi/wakeup_rm.S:12: Error: .size expression with symbol `wakeup_code_start' does not evaluate to a constant

The issue was introduced by commit d1ee433539ea5963a8f946f3428b335d1c5fdb20:
"x86, trampoline: Use the unified trampoline setup for ACPI wakeup"

The problem was discovered while using Debian's binutils (2.21.0.20110302-1)
and experimenting with binutils from upstream.

Thanks Alexander and H.J. for the vital help.

CC: Alexander van Heukelum <heukelum@fastmail.fm>
CC: "H.J. Lu" <hjl.tools@gmail.com>
CC: Len Brown <len.brown@intel.com>
CC: Pavel Machek <pavel@ucw.cz>
CC: "Rafael J. Wysocki" <rjw@sisk.pl>
CC: Thomas Gleixner <tglx@linutronix.de>
CC: Ingo Molnar <mingo@redhat.com>
CC: "H. Peter Anvin" <hpa@zytor.com>
CC: x86@kernel.org
CC: linux-pm@lists.linux-foundation.org
CC: linux-kernel@vger.kernel.org
CC: linux-next@vger.kernel.org
Signed-off-by: Sedat Dilek <sedat.dilek@gmail.com>
---
 arch/x86/kernel/acpi/wakeup_rm.S |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/arch/x86/kernel/acpi/wakeup_rm.S b/arch/x86/kernel/acpi/wakeup_rm.S
index 6ce81ee..63b8ab5 100644
--- a/arch/x86/kernel/acpi/wakeup_rm.S
+++ b/arch/x86/kernel/acpi/wakeup_rm.S
@@ -9,4 +9,4 @@
 	.globl	acpi_wakeup_code
 acpi_wakeup_code:
 	.incbin	"arch/x86/kernel/acpi/realmode/wakeup.bin"
-	.size	wakeup_code_start, .-wakeup_code_start
+	.size	acpi_wakeup_code, .-acpi_wakeup_code
-- 
1.7.4.1

Re: [PATCH] x86: Fix ACPI wakeup build failure

[Alexander van Heukelum]

On Tue, 08 Mar 2011 22:39 +0100, "Sedat Dilek" <sedat.dilek@googlemail.com> wrote:
> This fixes the following breakage in linux-next (next-20110308):
>   AS      arch/x86/kernel/acpi/wakeup_rm.o
>   arch/x86/kernel/acpi/wakeup_rm.S: Assembler messages:
>   arch/x86/kernel/acpi/wakeup_rm.S:12: Error: .size expression with
>   symbol `wakeup_code_start' does not evaluate to a constant
> 
> The issue was introduced by commit
> d1ee433539ea5963a8f946f3428b335d1c5fdb20:
> "x86, trampoline: Use the unified trampoline setup for ACPI wakeup"
> 
> The problem was discovered while using Debian's binutils
> (2.21.0.20110302-1)
> and experimenting with binutils from upstream.
> 
> Thanks Alexander and H.J. for the vital help.
> 
> CC: Alexander van Heukelum <heukelum@fastmail.fm>
> CC: "H.J. Lu" <hjl.tools@gmail.com>
> CC: Len Brown <len.brown@intel.com>
> CC: Pavel Machek <pavel@ucw.cz>
> CC: "Rafael J. Wysocki" <rjw@sisk.pl>
> CC: Thomas Gleixner <tglx@linutronix.de>
> CC: Ingo Molnar <mingo@redhat.com>
> CC: "H. Peter Anvin" <hpa@zytor.com>
> CC: x86@kernel.org
> CC: linux-pm@lists.linux-foundation.org
> CC: linux-kernel@vger.kernel.org
> CC: linux-next@vger.kernel.org
> Signed-off-by: Sedat Dilek <sedat.dilek@gmail.com>

Acked-by: Alexander van Heukelum <heukelum@fastmail.fm>

(This problem exists in the x86-tree. Mainline is fine.)

> ---
>  arch/x86/kernel/acpi/wakeup_rm.S |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/arch/x86/kernel/acpi/wakeup_rm.S
> b/arch/x86/kernel/acpi/wakeup_rm.S
> index 6ce81ee..63b8ab5 100644
> --- a/arch/x86/kernel/acpi/wakeup_rm.S
> +++ b/arch/x86/kernel/acpi/wakeup_rm.S
> @@ -9,4 +9,4 @@
>  	.globl	acpi_wakeup_code
>  acpi_wakeup_code:
>  	.incbin	"arch/x86/kernel/acpi/realmode/wakeup.bin"
> -       .size   wakeup_code_start, .-wakeup_code_start
> +       .size   acpi_wakeup_code, .-acpi_wakeup_code
> -- 
> 1.7.4.1
> 
> 

[tip:x86/trampoline] x86: Fix binutils-2.21 symbol related build failures

[tip-bot for Sedat Dilek]

Commit-ID:  2ae9d293b14d17f35eff624272cfecac7979a2ee
Gitweb:     http://git.kernel.org/tip/2ae9d293b14d17f35eff624272cfecac7979a2ee
Author:     Sedat Dilek <sedat.dilek@googlemail.com>
AuthorDate: Tue, 8 Mar 2011 22:39:24 +0100
Committer:  Ingo Molnar <mingo@elte.hu>
CommitDate: Wed, 9 Mar 2011 10:25:45 +0100

x86: Fix binutils-2.21 symbol related build failures

New binutils version 2.21.0.20110302-1 started checking that the symbol
parameter to the .size directive matches the entry name's
symbol parameter, unearthing two mismatches:

  AS      arch/x86/kernel/acpi/wakeup_rm.o
  arch/x86/kernel/acpi/wakeup_rm.S: Assembler messages:
  arch/x86/kernel/acpi/wakeup_rm.S:12: Error: .size expression with symbol `wakeup_code_start' does not evaluate to a constant

  arch/x86/kernel/entry_32.S: Assembler messages:
  arch/x86/kernel/entry_32.S:1421: Error: .size expression with
  symbol `apf_page_fault' does not evaluate to a constant

The problem was discovered while using Debian's binutils
(2.21.0.20110302-1) and experimenting with binutils from
upstream.

Thanks Alexander and H.J. for the vital help.

Signed-off-by: Sedat Dilek <sedat.dilek@gmail.com>
Cc: Alexander van Heukelum <heukelum@fastmail.fm>
Cc: H.J. Lu <hjl.tools@gmail.com>
Cc: Len Brown <len.brown@intel.com>
Cc: Pavel Machek <pavel@ucw.cz>
Cc: Rafael J. Wysocki <rjw@sisk.pl>
LKML-Reference: <1299620364-21644-1-git-send-email-sedat.dilek@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
---
 arch/x86/kernel/acpi/wakeup_rm.S |    2 +-
 arch/x86/kernel/entry_32.S       |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/x86/kernel/acpi/wakeup_rm.S b/arch/x86/kernel/acpi/wakeup_rm.S
index 6ce81ee..63b8ab5 100644
--- a/arch/x86/kernel/acpi/wakeup_rm.S
+++ b/arch/x86/kernel/acpi/wakeup_rm.S
@@ -9,4 +9,4 @@
 	.globl	acpi_wakeup_code
 acpi_wakeup_code:
 	.incbin	"arch/x86/kernel/acpi/realmode/wakeup.bin"
-	.size	wakeup_code_start, .-wakeup_code_start
+	.size	acpi_wakeup_code, .-acpi_wakeup_code
diff --git a/arch/x86/kernel/entry_32.S b/arch/x86/kernel/entry_32.S
index c8b4efa..9ca3b0e 100644
--- a/arch/x86/kernel/entry_32.S
+++ b/arch/x86/kernel/entry_32.S
@@ -1413,7 +1413,7 @@ ENTRY(async_page_fault)
 	CFI_ADJUST_CFA_OFFSET 4
 	jmp error_code
 	CFI_ENDPROC
-END(apf_page_fault)
+END(async_page_fault)
 #endif
 
 /*