Messages in this thread Patch in this message | | | Date | Tue, 20 Nov 2007 15:21:38 +0100 (CET) | From | Thomas Gleixner <> | Subject | Re: mm snapshot broken-out-2007-11-20-01-45.tar.gz uploaded |
| |
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; | |