Re: 2.6.12-rc2-mm2

["Rafael J. Wysocki" <rjw@sisk.pl>]

Hi,

On Friday, 8 of April 2005 13:46, Rafael J. Wysocki wrote:
> On Friday, 8 of April 2005 12:08, Andrew Morton wrote:
> > 
> > ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.12-rc2/2.6.12-rc2-mm2/
> > 
> > 
> > - Although small, bk-audit.patch was causing conflits with a couple of
> >   other projects.  Dropped for now.
> > 
> > - Greg is not using bk now, so bk-pci.patch, bk-i2c.patch,
> >   bk-driver-core.patch and bk-usb.patch have been replaced with gregkh-*.patch
> >   in -mm.
> > 
> > - Largeish x86_64 update
> 
> It does not compile on a uniprocessor x86-64:
> 
>   CC      arch/x86_64/kernel/process.o
>   CC      arch/x86_64/kernel/semaphore.o
>   CC      arch/x86_64/kernel/signal.o
>   AS      arch/x86_64/kernel/entry.o
>   CC      arch/x86_64/kernel/traps.o
>   CC      arch/x86_64/kernel/irq.o
>   CC      arch/x86_64/kernel/ptrace.o
>   CC      arch/x86_64/kernel/time.o
>   CC      arch/x86_64/kernel/ioport.o
>   CC      arch/x86_64/kernel/ldt.o
>   CC      arch/x86_64/kernel/setup.o
> arch/x86_64/kernel/setup.c: In function `amd_detect_cmp':
> arch/x86_64/kernel/setup.c:759: error: `cpu_core_id' undeclared (first use in this function)
> arch/x86_64/kernel/setup.c:759: error: (Each undeclared identifier is reported only once
> arch/x86_64/kernel/setup.c:759: error: for each function it appears in.)
> make[1]: *** [arch/x86_64/kernel/setup.o] Error 1
> make: *** [arch/x86_64/kernel] Error 2

A fix follows (I hope it's correct).

Greets,
Rafael


Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>

--- linux-2.6.12-rc2-mm2-orig/arch/x86_64/kernel/setup.c	2005-04-08 18:38:03.000000000 +0200
+++ linux-2.6.12-rc2-mm2/arch/x86_64/kernel/setup.c	2005-04-08 18:32:41.000000000 +0200
@@ -746,6 +746,7 @@ static void __init display_cacheinfo(str
 	}
 }
 
+#ifdef CONFIG_SMP
 /*
  * On a AMD dual core setup the lower bits of the APIC id distingush the cores.
  * Assumes number of cores is a power of two.
@@ -773,6 +774,11 @@ static void __init amd_detect_cmp(struct
 	printk(KERN_INFO "CPU %d(%d) -> Node %d -> Core %d\n",
 			cpu, c->x86_num_cores, node, cpu_core_id[cpu]);
 }
+#else
+static void __init amd_detect_cmp(struct cpuinfo_x86 *c)
+{
+}
+#endif
 
 static int __init init_amd(struct cpuinfo_x86 *c)
 {

-- 
- Would you tell me, please, which way I ought to go from here?
- That depends a good deal on where you want to get to.
		-- Lewis Carroll "Alice's Adventures in Wonderland"