From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756689AbYGNQYZ (ORCPT ); Mon, 14 Jul 2008 12:24:25 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753738AbYGNQYS (ORCPT ); Mon, 14 Jul 2008 12:24:18 -0400 Received: from mx2.suse.de ([195.135.220.15]:38313 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753386AbYGNQYR (ORCPT ); Mon, 14 Jul 2008 12:24:17 -0400 Date: Wed, 16 Jul 2008 02:23:59 +0200 Message-ID: From: Takashi Iwai To: Stephen Rothwell Cc: Glauber Costa , Ingo Molnar , linux-next@vger.kernel.org, LKML Subject: Re: linux-next: Tree for July 14 In-Reply-To: <20080714201249.947400d0.sfr@canb.auug.org.au> References: <20080714201249.947400d0.sfr@canb.auug.org.au> User-Agent: Wanderlust/2.12.0 (Your Wildest Dreams) SEMI/1.14.6 (Maruoka) FLIM/1.14.7 (=?ISO-8859-4?Q?Sanj=F2?=) APEL/10.6 Emacs/22.2 (x86_64-suse-linux-gnu) MULE/5.0 (SAKAKI) MIME-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") Content-Type: text/plain; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi, another build failure of next-20080714, this time on x86-64: AS arch/x86/lib/csum-copy_64.o arch/x86/lib/csum-copy_64.S: Assembler messages: arch/x86/lib/csum-copy_64.S:48: Error: Macro `ignore' was already defined Indeed, it's defined in asm/dwarf2.h, too. The patch below fixed the build. Takashi --- diff --git a/include/asm-x86/dwarf2.h b/include/asm-x86/dwarf2.h index 0bfe250..e65e65a 100644 --- a/include/asm-x86/dwarf2.h +++ b/include/asm-x86/dwarf2.h @@ -38,23 +38,23 @@ /* Due to the structure of pre-exisiting code, don't use assembler line comment character # to ignore the arguments. Instead, use a dummy macro. */ -.macro ignore a=0, b=0, c=0, d=0 +.macro dw_ignore a=0, b=0, c=0, d=0 .endm -#define CFI_STARTPROC ignore -#define CFI_ENDPROC ignore -#define CFI_DEF_CFA ignore -#define CFI_DEF_CFA_REGISTER ignore -#define CFI_DEF_CFA_OFFSET ignore -#define CFI_ADJUST_CFA_OFFSET ignore -#define CFI_OFFSET ignore -#define CFI_REL_OFFSET ignore -#define CFI_REGISTER ignore -#define CFI_RESTORE ignore -#define CFI_REMEMBER_STATE ignore -#define CFI_RESTORE_STATE ignore -#define CFI_UNDEFINED ignore -#define CFI_SIGNAL_FRAME ignore +#define CFI_STARTPROC dw_ignore +#define CFI_ENDPROC dw_ignore +#define CFI_DEF_CFA dw_ignore +#define CFI_DEF_CFA_REGISTER dw_ignore +#define CFI_DEF_CFA_OFFSET dw_ignore +#define CFI_ADJUST_CFA_OFFSET dw_ignore +#define CFI_OFFSET dw_ignore +#define CFI_REL_OFFSET dw_ignore +#define CFI_REGISTER dw_ignore +#define CFI_RESTORE dw_ignore +#define CFI_REMEMBER_STATE dw_ignore +#define CFI_RESTORE_STATE dw_ignore +#define CFI_UNDEFINED dw_ignore +#define CFI_SIGNAL_FRAME dw_ignore #endif