patch-1.3.31 linux/include/asm-i386/smp.h

Next file: linux/include/asm-i386/system.h
Previous file: linux/include/asm-i386/page.h
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v1.3.30/linux/include/asm-i386/smp.h linux/include/asm-i386/smp.h
@@ -1,6 +1,7 @@
 #ifndef __ASM_SMP_H
 #define __ASM_SMP_H
 
+#ifdef CONFIG_SMP
 #ifndef ASSEMBLY
 
 #include <asm/i82489.h>
@@ -165,7 +166,7 @@
 };
 
 
-extern struct cpuinfo_x86 cpu_data[NR_PROCS];
+extern struct cpuinfo_x86 cpu_data[NR_CPUS];
 
 /*
  *	Private routines/data
@@ -174,7 +175,7 @@
 extern void smp_scan_config(unsigned long, unsigned long);
 extern unsigned long smp_alloc_memory(unsigned long mem_base);
 extern unsigned char *apic_reg;
-extern unsigned char *kernel_stacks[NR_PROCS];
+extern unsigned char *kernel_stacks[NR_CPUS];
 extern unsigned char boot_cpu_id;
 extern unsigned long cpu_present_map;
 extern void smp_invalidate(void);
@@ -227,5 +228,5 @@
 #endif /* !ASSEMBLY */
 
 #define NO_PROC_ID		0xFF		/* No processor magic marker */
-
+#endif
 #endif

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov with Sam's (original) version
of this