patch-2.1.34 linux/include/asm-sparc64/smp.h

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

diff -u --recursive --new-file v2.1.33/linux/include/asm-sparc64/smp.h linux/include/asm-sparc64/smp.h
@@ -19,6 +19,7 @@
 };
 
 extern int linux_num_cpus;	/* number of CPUs probed  */
+extern struct prom_cpuinfo linux_cpus[NCPUS];
 
 #endif /* !(__ASSEMBLY__) */
 
@@ -26,8 +27,6 @@
 
 #ifndef __ASSEMBLY__
 
-extern struct prom_cpuinfo linux_cpus[NCPUS];
-
 /* Per processor Sparc parameters we need. */
 
 struct cpuinfo_sparc {
@@ -71,8 +70,6 @@
 extern void smp_store_cpu_info(int id);
 extern void smp_cross_call(smpfunc_t func, unsigned long arg1, unsigned long arg2,
 			   unsigned long arg3, unsigned long arg4, unsigned long arg5);
-extern void smp_capture(void);
-extern void smp_release(void);
 
 extern __inline__ void xc0(smpfunc_t func) { smp_cross_call(func, 0, 0, 0, 0, 0); }
 extern __inline__ void xc1(smpfunc_t func, unsigned long arg1)
@@ -126,7 +123,8 @@
 2:
 	membar		#StoreStore | #StoreLoad
 " 	: "=&r" (temp0), "=&r" (temp1), "=r" (ctr)
-	: "ir" (i), "r" (ctr));
+	: "ir" (i), "r" (ctr)
+	: "cc");
 }
 
 extern __inline__ __volatile__ void dec_smp_counter(volatile int *ctr)
@@ -144,7 +142,8 @@
 2:
 	membar		#StoreStore | #StoreLoad
 " 	: "=&r" (temp0), "=&r" (temp1), "=r" (ctr)
-	: "ir" (i), "r" (ctr));
+	: "ir" (i), "r" (ctr)
+	: "cc");
 }
 
 extern __inline__ __volatile__ int read_smp_counter(volatile int *ctr)
@@ -155,7 +154,6 @@
 #endif /* !(__ASSEMBLY__) */
 
 /* Sparc specific messages. */
-#define MSG_CAPTURE            0x0004       /* Park a processor. */
 #define MSG_CROSS_CALL         0x0005       /* run func on cpus */
 
 /* Empirical PROM processor mailbox constants.  If the per-cpu mailbox

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