[tip:x86/asm] um, x86-64: Fix UML build after adding CFI annotations to lib/rwsem_64.S

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Commit-ID:  bfc39061d3dbf812e6a78f9529a548e5f0050c64
Gitweb:     http://git.kernel.org/tip/bfc39061d3dbf812e6a78f9529a548e5f0050c64
Author:     Jan Beulich <JBeulich@xxxxxxxxxx>
AuthorDate: Tue, 1 Mar 2011 11:14:55 +0000
Committer:  Ingo Molnar <mingo@xxxxxxx>
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@xxxxxxxxxx>
Cc: Jeff Dike <jdike@xxxxxxxxxxx>
LKML-Reference: <4D6CE3400200007800034498@xxxxxxxxxxxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
---
 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
 
--
To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[Index of Archives]     [Linux Stable Commits]     [Linux Stable Kernel]     [Linux Kernel]     [Linux USB Devel]     [Linux Video &Media]     [Linux Audio Users]     [Yosemite News]     [Linux SCSI]

  Powered by Linux