[parisc-linux] SMP now working again

[Matthew Wilcox]

With the change I committed as 2.4.9-pa45, CONFIG_SMP works again.
For those with machines with discontiguous CPU numbers (eg an L2k with
only two processors), this further patch is required.  I think this is
masking a real bug which may cause problems at a later date, so I'm not
committing this workaround to CVS yet -- I'd rather find the real bug.

I've only tested on an L2k with 2 CPUs, so other testing would be
welcomed.  Thanks to jsm & grant for helping me with this.

Index: arch/parisc/kernel/processor.c
===================================================================
RCS file: /home/cvs/parisc/linux/arch/parisc/kernel/processor.c,v
retrieving revision 1.3
diff -u -p -r1.3 processor.c
--- processor.c	2001/10/06 08:00:03	1.3
+++ processor.c	2001/10/09 00:27:02
@@ -125,9 +125,9 @@ static int __init processor_probe(struct
 		txn_addr = dev->hpa;	/* for legacy PDC */
 
 		/* logical CPU ID and update global counter */
-		cpuid = boot_cpu_data.cpu_count;
 	}
 
+	cpuid = boot_cpu_data.cpu_count;
 	p = &cpu_data[cpuid];
 	boot_cpu_data.cpu_count++;

I also enabled EARLY_BOOTUP_DEBUG with the following patch to figure
out what was going on.
 
Index: arch/parisc/kernel/pdc_cons.c
===================================================================
RCS file: /home/cvs/parisc/linux/arch/parisc/kernel/pdc_cons.c,v
retrieving revision 1.28
diff -u -p -r1.28 pdc_cons.c
--- pdc_cons.c	2001/06/20 14:16:10	1.28
+++ pdc_cons.c	2001/10/09 00:27:02
@@ -12,7 +12,7 @@
 
 /* Define EARLY_BOOTUP_DEBUG to debug kernel related boot problems. 
  * On production kernels EARLY_BOOTUP_DEBUG should be undefined. */
-#undef EARLY_BOOTUP_DEBUG
+#define EARLY_BOOTUP_DEBUG
 
 
 #include <linux/config.h>

-- 
Revolutions do not require corporate support.