diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1997-07-20 14:56:40 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1997-07-20 14:56:40 +0000 |
| commit | e308faf24f68e262d92d294a01ddca7a17e76762 (patch) | |
| tree | 22c47cb315811834861f013067878ff664e95abd /arch/sparc64/kernel/devices.c | |
| parent | 30c6397ce63178fcb3e7963ac247f0a03132aca9 (diff) | |
Sync with Linux 2.1.46.
Diffstat (limited to 'arch/sparc64/kernel/devices.c')
| -rw-r--r-- | arch/sparc64/kernel/devices.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/sparc64/kernel/devices.c b/arch/sparc64/kernel/devices.c index 6aadd14e0..5e6705896 100644 --- a/arch/sparc64/kernel/devices.c +++ b/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 @@ device_scan(unsigned long mem_start)) }; 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); }; |