Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755805Ab1CAI0u (ORCPT ); Tue, 1 Mar 2011 03:26:50 -0500 Received: from vpn.id2.novell.com ([195.33.99.129]:33589 "EHLO vpn.id2.novell.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755696Ab1CAI0t convert rfc822-to-8bit (ORCPT ); Tue, 1 Mar 2011 03:26:49 -0500 Message-Id: <4D6CBBD502000078000343DF@vpn.id2.novell.com> X-Mailer: Novell GroupWise Internet Agent 8.0.1 Date: Tue, 01 Mar 2011 08:26:45 +0000 From: "Jan Beulich" To: "Ingo Molnar" Cc: , , , , Subject: Re: [tip:x86/asm] x86-64: Add CFI annotations to lib/rwsem_64.S References: <4D6BCDFF02000078000341B0@vpn.id2.novell.com> <20110228182642.GA7041@elte.hu> In-Reply-To: <20110228182642.GA7041@elte.hu> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 8BIT Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1800 Lines: 48 >>> On 28.02.11 at 19:26, Ingo Molnar wrote: > * tip-bot for Jan Beulich wrote: > >> Commit-ID: 39f2205e1abd1b6fffdaf45e1f1c3049a5f8999c >> Gitweb: > http://git.kernel.org/tip/39f2205e1abd1b6fffdaf45e1f1c3049a5f8999c >> Author: Jan Beulich >> AuthorDate: Mon, 28 Feb 2011 15:31:59 +0000 >> Committer: Ingo Molnar >> CommitDate: Mon, 28 Feb 2011 18:06:21 +0100 >> >> x86-64: Add CFI annotations to lib/rwsem_64.S >> >> These weren't part of the initial commit of this code. >> >> Signed-off-by: Jan Beulich >> Cc: Alexander van Heukelum >> LKML-Reference: <4D6BCDFF02000078000341B0@vpn.id2.novell.com> >> Signed-off-by: Ingo Molnar >> --- >> arch/x86/lib/rwsem_64.S | 56 ++++++++++++++++++++++++++++------------------ >> 1 files changed, 34 insertions(+), 22 deletions(-) > > this change breaks the UML build: > > tip/arch/um/sys-x86_64/../../x86/lib/rwsem_64.S:46: Error: no such > instruction: `pushq_cfi %rdi' Any reason why 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. And I wonder what other inconsistencies this may cause... If this is on purpose (i.e. simply adding X86_64 as a new config option there isn't the right solution), what would be the preferred way of fixing this in asm/dwarf2.h: - #ifndef CONFIG_X86_32, - #ifdef CONFIG_64BIT, - yet something else? Thanks, Jan -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/