patch-2.1.48 linux/include/asm-sparc64/semaphore.h

• Lines: 32
• Date: Thu Jul 31 13:09:18 1997
• Orig file: v2.1.47/linux/include/asm-sparc64/semaphore.h
• Orig date: Wed Apr 23 19:01:28 1997

diff -u --recursive --new-file v2.1.47/linux/include/asm-sparc64/semaphore.h linux/include/asm-sparc64/semaphore.h
@@ -24,20 +24,17 @@
 
 #define wake_one_more(sem)      atomic_inc(&sem->waking);
 
-extern __inline__ int waking_non_zero(struct semaphore *sem)
-{
-        unsigned long flags;
-        int ret = 0;
-
-        save_flags(flags);
-        cli();
-        if (atomic_read(&sem->waking) > 0) {
-                atomic_dec(&sem->waking);
-                ret = 1;
-        }
-        restore_flags(flags);
-        return ret;
-}
+#define waking_non_zero(sem) \
+({	unsigned long flags; \
+	int ret = 0; \
+	save_and_cli(flags); \
+	if (atomic_read(&sem->waking) > 0) { \
+		atomic_dec(&sem->waking); \
+		ret = 1; \
+	} \
+	restore_flags(flags); \
+	ret; \
+})
 
 extern __inline__ void down(struct semaphore * sem)
 {