Messages in this thread Patch in this message | | | Date | Tue, 1 Mar 2011 11:33:58 GMT | From | tip-bot for Jan Beulich <> | Subject | [tip:x86/asm] um, x86-64: Fix UML build after adding CFI annotations to lib/rwsem_64.S |
| |
Commit-ID: bfc39061d3dbf812e6a78f9529a548e5f0050c64 Gitweb: http://git.kernel.org/tip/bfc39061d3dbf812e6a78f9529a548e5f0050c64 Author: Jan Beulich <JBeulich@novell.com> AuthorDate: Tue, 1 Mar 2011 11:14:55 +0000 Committer: Ingo Molnar <mingo@elte.hu> CommitDate: Tue, 1 Mar 2011 12:19:44 +0100
um, x86-64: Fix UML build after adding CFI annotations to lib/rwsem_64.S
arch/um/Kconfig.x86 has X86_32 but not X86_64 - that's resulting in asm/dwarf2.h producing the 32-bit (pushl_cfi & Co) macros instead of the 64-bit ones.
Signed-off-by: Jan Beulich <jbeulich@novell.com> Cc: Jeff Dike <jdike@addtoit.com> LKML-Reference: <4D6CE3400200007800034498@vpn.id2.novell.com> Signed-off-by: Ingo Molnar <mingo@elte.hu> --- arch/um/Kconfig.x86 | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/arch/um/Kconfig.x86 b/arch/um/Kconfig.x86 index 5ee3280..62f2115 100644 --- a/arch/um/Kconfig.x86 +++ b/arch/um/Kconfig.x86 @@ -19,6 +19,9 @@ config X86_32 def_bool !64BIT select HAVE_AOUT +config X86_64 + def_bool 64BIT + config RWSEM_XCHGADD_ALGORITHM def_bool X86_XADD
| |