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

From: Sedat Dilek <[email-masked]>
Date: Tue, 8 Mar 2011 22:39:24 +0100

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 <[email-masked]>
CC: "H.J. Lu" <[email-masked]>
CC: Len Brown <[email-masked]>
CC: Pavel Machek <[email-masked]>
CC: "Rafael J. Wysocki" <[email-masked]>
CC: Thomas Gleixner <[email-masked]>
CC: Ingo Molnar <[email-masked]>
CC: "H. Peter Anvin" <[email-masked]>
CC: [email-masked]
CC: [email-masked]
CC: [email-masked]
CC: [email-masked]
Signed-off-by: Sedat Dilek <[email-masked]>
---
 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