patch-2.4.0-test4 linux/arch/i386/kernel/smp.c

• Lines: 46
• Date: Wed Jul 12 12:47:20 2000
• Orig file: v2.4.0-test3/linux/arch/i386/kernel/smp.c
• Orig date: Mon Jun 19 16:31:57 2000

diff -u --recursive --new-file v2.4.0-test3/linux/arch/i386/kernel/smp.c linux/arch/i386/kernel/smp.c
@@ -392,6 +392,8 @@
  * Structure and data for smp_call_function(). This is designed to minimise
  * static memory requirements. It also looks cleaner.
  */
+static spinlock_t call_lock = SPIN_LOCK_UNLOCKED;
+
 static volatile struct call_data_struct {
 	void (*func) (void *info);
 	void *info;
@@ -422,9 +424,8 @@
 {
 	struct call_data_struct data;
 	int ret, cpus = smp_num_cpus-1;
-	static spinlock_t lock = SPIN_LOCK_UNLOCKED;
 
-	if(cpus == 0)
+	if (!cpus)
 		return 0;
 
 	data.func = func;
@@ -434,21 +435,21 @@
 	if (wait)
 		atomic_set(&data.finished, 0);
 
-	spin_lock_bh(&lock);
+	spin_lock_bh(&call_lock);
 	call_data = &data;
 	/* Send a message to all other CPUs and wait for them to respond */
 	send_IPI_allbutself(CALL_FUNCTION_VECTOR);
 
 	/* Wait for response */
-	/* FIXME: lock-up detection, backtrace on lock-up */
-	while(atomic_read(&data.started) != cpus)
+	while (atomic_read(&data.started) != cpus)
 		barrier();
 
 	ret = 0;
 	if (wait)
 		while (atomic_read(&data.finished) != cpus)
 			barrier();
-	spin_unlock_bh(&lock);
+	spin_unlock_bh(&call_lock);
+
 	return 0;
 }