[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <tip-2ae9d293b14d17f35eff624272cfecac7979a2ee@git.kernel.org>
Date: Wed, 9 Mar 2011 11:21:52 GMT
From: tip-bot for Sedat Dilek <sedat.dilek@...glemail.com>
To: linux-tip-commits@...r.kernel.org
Cc: linux-kernel@...r.kernel.org, hpa@...or.com, mingo@...hat.com,
heukelum@...tmail.fm, sedat.dilek@...glemail.com, pavel@....cz,
tglx@...utronix.de, rjw@...k.pl, mingo@...e.hu,
sedat.dilek@...il.com, hjl.tools@...il.com, len.brown@...el.com
Subject: [tip:x86/trampoline] x86: Fix binutils-2.21 symbol related build failures
Commit-ID: 2ae9d293b14d17f35eff624272cfecac7979a2ee
Gitweb: http://git.kernel.org/tip/2ae9d293b14d17f35eff624272cfecac7979a2ee
Author: Sedat Dilek <sedat.dilek@...glemail.com>
AuthorDate: Tue, 8 Mar 2011 22:39:24 +0100
Committer: Ingo Molnar <mingo@...e.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@...il.com>
Cc: Alexander van Heukelum <heukelum@...tmail.fm>
Cc: H.J. Lu <hjl.tools@...il.com>
Cc: Len Brown <len.brown@...el.com>
Cc: Pavel Machek <pavel@....cz>
Cc: Rafael J. Wysocki <rjw@...k.pl>
LKML-Reference: <1299620364-21644-1-git-send-email-sedat.dilek@...il.com>
Signed-off-by: Ingo Molnar <mingo@...e.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
/*
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists