Compile error: 2.4.15-pre4 (-tr) in kernel.o (cpu_init()) - advice req'd

[Ben Ryan]

hey all

hope this doesn't turn out to be spurious traffic...

ia32/uniproc

linux-2.4.14.tar (kernel tar)
patch-2.4.15-pre4 (merge)
fix-2.4.15-pre4-tr.diff (benlahaise; don't mind the filename, i just
                         reckon calling the patch for the patch,
                         patch-2.4.* is brokenness)

there is some weirdness on the box i'm compiling on; please check the
following for obvious causes...
pre-compile make's worked fine, but the compile itself crashed out
with:

arch/i386/kernel/kernel.o: In function 'cpu_init':
arch/i386/kernel/kernel.o(.text.init+0x27f9): undefined reference to 'cpucount'
arch/i386/kernel/kernel.o(.text.init+0x2831): undefined reference to 'cpucount'

Can anyone spot if it's code or meatware related??
Thanx, I won't be able to sleep till I know what's going on :)

cheers
ben

Segment of kernel.o containing the offender:
================
  * cpu_init() initializes state that is per-CPU. Some data is already
@@ -2815,14 +2817,15 @@
  */
 void __init cpu_init (void)
 {
-       int nr = smp_processor_id();
+       int nr = cpucount;
+       struct task_struct *cur = init_tasks[nr];
        struct tss_struct * t = &init_tss[nr];
 
        if (test_and_set_bit(nr, &cpu_initialized)) {
                printk(KERN_WARNING "CPU#%d already initialized!\n", nr);
                for (;;) __sti();