summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Beulich <JBeulich@novell.com>2011-03-01 11:14:55 +0000
committerIngo Molnar <mingo@elte.hu>2011-03-01 12:19:44 +0100
commitbfc39061d3dbf812e6a78f9529a548e5f0050c64 (patch)
treed68b1dde8750cc3e1b7e5714a4e7e4b5eeb1a06a
parent039e13890b0615cb8c5c04b6afa84d676e24c761 (diff)
downloadlinux-3.10-bfc39061d3dbf812e6a78f9529a548e5f0050c64.tar.gz
linux-3.10-bfc39061d3dbf812e6a78f9529a548e5f0050c64.tar.bz2
linux-3.10-bfc39061d3dbf812e6a78f9529a548e5f0050c64.zip
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>
-rw-r--r--arch/um/Kconfig.x863
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/um/Kconfig.x86 b/arch/um/Kconfig.x86
index 5ee328099c6..62f21156aaa 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