Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758529AbXKTOWO (ORCPT ); Tue, 20 Nov 2007 09:22:14 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753057AbXKTOV7 (ORCPT ); Tue, 20 Nov 2007 09:21:59 -0500 Received: from www.tglx.de ([62.245.132.106]:33803 "EHLO www.tglx.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751976AbXKTOV6 (ORCPT ); Tue, 20 Nov 2007 09:21:58 -0500 Date: Tue, 20 Nov 2007 15:21:38 +0100 (CET) From: Thomas Gleixner To: Kamalesh Babulal cc: akpm@linux-foundation.org, mm-commits@vger.kernel.org, linux-kernel@vger.kernel.org, mingo@elte.hu, Andy Whitcroft , Balbir Singh Subject: Re: mm snapshot broken-out-2007-11-20-01-45.tar.gz uploaded In-Reply-To: Message-ID: References: <200711200953.lAK9qxjO030444@imap1.linux-foundation.org> <4742C54B.1080709@linux.vnet.ibm.com> MIME-Version: 1.0 Content-Type: MULTIPART/MIXED; BOUNDARY="8323328-1652249260-1195568500=:25057" Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2035 Lines: 59 This message is in MIME format. The first part should be readable text, while the remaining parts are likely unreadable without MIME-aware tools. --8323328-1652249260-1195568500=:25057 Content-Type: TEXT/PLAIN; charset=ISO-2022-JP On Tue, 20 Nov 2007, Thomas Gleixner wrote: > > arch/x86/kernel/setup_64.c:991: error: redefinition of ‘identify_cpu’ > > arch/x86/kernel/setup_64.c:958: error: previous definition of ‘identify_cpu’ was here > > make[1]: *** [arch/x86/kernel/setup_64.o] Error 1 > > make: *** [arch/x86/kernel] Error 2 > > > > The patch causing this error is git-x86.patch > > Jeremy pointed me to this already. I'm looking into this. Fix below. tglx --- arch/x86/kernel/setup_64.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) Index: linux-2.6-x86/arch/x86/kernel/setup_64.c =================================================================== --- linux-2.6-x86.orig/arch/x86/kernel/setup_64.c 2007-11-20 15:18:20.000000000 +0100 +++ linux-2.6-x86/arch/x86/kernel/setup_64.c 2007-11-20 15:18:57.000000000 +0100 @@ -634,8 +634,7 @@ static __cpuinit int amd_apic_timer_brok static void __cpuinit early_init_amd(struct cpuinfo_x86 *c) { #ifdef CONFIG_SMP - unsigned bits; - unsigned ecx; + unsigned bits, ecx; /* Multi core CPU? */ if (c->extended_cpuid_level < 0x80000008) @@ -942,13 +941,6 @@ static void __cpuinit early_identify_cpu #ifdef CONFIG_SMP c->phys_proc_id = (cpuid_ebx(1) >> 24) & 0xff; #endif -} - -/* - * This does the hard work of actually picking apart the CPU stuff... - */ -void __cpuinit identify_cpu(struct cpuinfo_x86 *c) -{ /* AMD-defined flags: level 0x80000001 */ xlvl = cpuid_eax(0x80000000); c->extended_cpuid_level = xlvl; --8323328-1652249260-1195568500=:25057-- - 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/