[PATCH] x86: Fix ACPI wakeup build failure

From: Sedat Dilek
Date: Tue Mar 08 2011 - 16:39:49 EST


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@xxxxxxxxxxx>
CC: "H.J. Lu" <hjl.tools@xxxxxxxxx>
CC: Len Brown <len.brown@xxxxxxxxx>
CC: Pavel Machek <pavel@xxxxxx>
CC: "Rafael J. Wysocki" <rjw@xxxxxxx>
CC: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
CC: Ingo Molnar <mingo@xxxxxxxxxx>
CC: "H. Peter Anvin" <hpa@xxxxxxxxx>
CC: x86@xxxxxxxxxx
CC: linux-pm@xxxxxxxxxxxxxxxxxxxxxxxxxx
CC: linux-kernel@xxxxxxxxxxxxxxx
CC: linux-next@xxxxxxxxxxxxxxx
Signed-off-by: Sedat Dilek <sedat.dilek@xxxxxxxxx>
---
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

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