- 2.6.2 - spinlock.h - compiler cleanups

@@ -411,11 +411,15 @@
 	 * attempt to acquire the lock bit.
 	 */
 	preempt_disable();
+
 #if defined(CONFIG_SMP) || defined(CONFIG_DEBUG_SPINLOCK)
 	while (test_and_set_bit(bitnum, addr)) {
 		while (test_bit(bitnum, addr))
 			cpu_relax();
 	}
+#else
+	addr = addr;
+	bitnum = bitnum;
 #endif
 }
 

@@ -434,6 +438,8 @@
 	return ret;
 #else
 	preempt_disable();
+	bitnum = bitnum;
+	addr = addr;
 	return 1;
 #endif
 }

@@ -447,6 +453,9 @@
 	BUG_ON(!test_bit(bitnum, addr));
 	smp_mb__before_clear_bit();
 	clear_bit(bitnum, addr);
+#else
+	bitnum = bitnum;
+	addr = addr;
 #endif
 	preempt_enable();
 }

@@ -459,8 +468,12 @@
 #if defined(CONFIG_SMP) || defined(CONFIG_DEBUG_SPINLOCK)
 	return test_bit(bitnum, addr);
 #elif defined CONFIG_PREEMPT
+	bitnum = bitnum;
+	addr = addr;
 	return preempt_count();
 #else
+	bitnum = bitnum;
+	addr = addr;
 	return 1;
 #endif
 }