patch-2.3.99-pre9 linux/include/asm-mips64/spinlock.h

• Lines: 44
• Date: Sat May 13 08:31:25 2000
• Orig file: v2.3.99-pre8/linux/include/asm-mips64/spinlock.h
• Orig date: Sat Feb 26 22:31:57 2000

diff -u --recursive --new-file v2.3.99-pre8/linux/include/asm-mips64/spinlock.h linux/include/asm-mips64/spinlock.h
@@ -22,6 +22,9 @@
 
 #define spin_lock_init(x)	do { (x)->lock = 0; } while(0);
 
+#define spin_is_locked(x)	((x)->lock != 0)
+#define spin_unlock_wait(x)	({ do { barrier(); } while ((x)->lock); })
+
 /*
  * Simple spin lock operations.  There are two variants, one clears IRQ's
  * on the local processor, one does not.
@@ -62,7 +65,24 @@
 	: "memory");
 }
 
-#define spin_trylock(lock) (!test_and_set_bit(0,(lock)))
+static inline unsigned int spin_trylock(spinlock_t *lock)
+{
+	unsigned int temp, res;
+
+	__asm__ __volatile__(
+	".set\tnoreorder\t\t\t# spin_trylock\n\t"
+	"1:\tll\t%0, %1\n\t"
+	"or\t%2, %0, %3\n\t"
+	"sc\t%2, %1\n\t"
+	"beqz\t%2, 1b\n\t"
+	" and\t%2, %0, %3\n\t"
+	".set\treorder"
+	:"=&r" (temp), "=m" (*lock), "=&r" (res)
+	:"r" (1), "m" (*lock)
+	: "memory");
+
+	return res == 0;
+}
 
 /*
  * Read-write spinlocks, allowing multiple readers but only one writer.
@@ -110,6 +130,7 @@
 	"sub\t%1, 1\n\t"
 	"sc\t%1, %0\n\t"
 	"beqz\t%1, 1b\n\t"
+	"sync\n\t"
 	".set\treorder"	
 	: "=o" (__dummy_lock(rw)), "=&r" (tmp)
 	: "o" (__dummy_lock(rw))