The Linux Kernel Mailing List
 help / color / mirror / Atom feed
From: tip-bot for Jan Beulich <JBeulich@novell.com>
To: linux-tip-commits@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, jdike@addtoit.com, hpa@zytor.com,
	mingo@redhat.com, jbeulich@novell.com, JBeulich@novell.com,
	tglx@linutronix.de, mingo@elte.hu
Subject: [tip:x86/asm] um, x86-64: Fix UML build after adding CFI annotations to lib/rwsem_64.S
Date: Tue, 1 Mar 2011 11:33:58 GMT	[thread overview]
Message-ID: <tip-bfc39061d3dbf812e6a78f9529a548e5f0050c64@git.kernel.org> (raw)
In-Reply-To: <4D6CE3400200007800034498@vpn.id2.novell.com>

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
 

  reply	other threads:[~2011-03-01 11:34 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-03-01 11:14 [PATCH] x86-64: fix UML build after adding CFI annotations to lib/rwsem_64.S Jan Beulich
2011-03-01 11:33 ` tip-bot for Jan Beulich [this message]
2011-03-01 12:07 ` Stratos Psomadakis

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=tip-bfc39061d3dbf812e6a78f9529a548e5f0050c64@git.kernel.org \
    --to=jbeulich@novell.com \
    --cc=hpa@zytor.com \
    --cc=jdike@addtoit.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-tip-commits@vger.kernel.org \
    --cc=mingo@elte.hu \
    --cc=mingo@redhat.com \
    --cc=tglx@linutronix.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox