patch-2.1.44 linux/arch/sparc64/kernel/devices.c

Next file: linux/arch/sparc64/kernel/dtlb_miss.S
Previous file: linux/arch/sparc64/kernel/cpu.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.43/linux/arch/sparc64/kernel/devices.c linux/arch/sparc64/kernel/devices.c
@@ -6,7 +6,6 @@
 
 #include <linux/kernel.h>
 #include <linux/tasks.h>
-#include <linux/config.h>
 #include <linux/init.h>
 
 #include <asm/page.h>
@@ -15,7 +14,7 @@
 #include <asm/smp.h>
 
 struct prom_cpuinfo linux_cpus[NCPUS];
-int linux_num_cpus;
+int linux_num_cpus = 0;
 
 extern void cpu_probe(void);
 
@@ -54,7 +53,7 @@
 		};
 		if(cpu_ctr == 0) {
 			printk("No CPU nodes found, cannot continue.\n");
-			halt();
+			prom_halt();
 		}
 		printk("Found %d CPU prom device tree node(s).\n", cpu_ctr);
 	};

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov