patch-2.1.23 linux/include/asm-sparc/smp.h

Next file: linux/include/asm-sparc/smp_lock.h
Previous file: linux/include/asm-sparc/sigcontext.h
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.22/linux/include/asm-sparc/smp.h linux/include/asm-sparc/smp.h
@@ -15,6 +15,8 @@
 	int prom_node;
 	int mid;
 };
+extern int linux_num_cpus;	/* number of CPUs probed  */
+
 #endif /* !(__ASSEMBLY__) */
 
 #ifdef __SMP__
@@ -31,8 +33,13 @@
 
 extern struct cpuinfo_sparc cpu_data[NR_CPUS];
 
-typedef __volatile__ unsigned char klock_t;
-extern klock_t kernel_flag;
+struct klock_info {
+	unsigned char kernel_flag;
+	unsigned char akp;
+	unsigned char irq_udt;
+};
+
+extern struct klock_info klock_info;
 
 #define KLOCK_HELD       0xff
 #define KLOCK_CLEAR      0x00
@@ -45,12 +52,8 @@
 extern unsigned char boot_cpu_id;
 extern unsigned long cpu_present_map;
 extern __volatile__ unsigned long smp_invalidate_needed[NR_CPUS];
-extern __volatile__ unsigned long kernel_counter;
-extern __volatile__ unsigned char active_kernel_processor;
 extern void smp_message_irq(void);
 extern unsigned long ipi_count;
-extern __volatile__ unsigned long kernel_counter;
-extern __volatile__ unsigned long syscall_count;
 
 extern void print_lock_state(void);
 
@@ -167,6 +170,11 @@
 #define SMP_FROM_INT		1
 #define SMP_FROM_SYSCALL	2
 
+#else /* !(__SMP__) */
+
+#define smp_capture()		do { } while(0)
+#define smp_release()		do { } while(0)
+ 
 #endif /* !(__SMP__) */
 
 #endif /* !(_SPARC_SMP_H) */

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