Changes in kernel/generic/include/synch/spinlock.h [cc106e4:b2fa1204] in mainline

File:

• kernel/generic/include/synch/spinlock.h (modified) (5 diffs)

kernel/generic/include/synch/spinlock.h

@@ -45 +45 @@
 #ifdef CONFIG_SMP
 
-typedef struct spinlock {
+typedef struct {
         atomic_t val;
         
@@ -137 +137 @@
 #ifdef CONFIG_DEBUG_SPINLOCK
 
-#include <print.h>
+#include <log.h>
 
 #define DEADLOCK_THRESHOLD  100000000
@@ -146 +146 @@
         if ((pname)++ > (value)) { \
                 (pname) = 0; \
-                printf("Deadlock probe %s: exceeded threshold %u\n" \
+                log(LF_OTHER, LVL_WARN, \
+                    "Deadlock probe %s: exceeded threshold %u\n" \
                     "cpu%u: function=%s, line=%u\n", \
                     #pname, (value), CPU->id, __func__, __LINE__); \
@@ -162 +163 @@
 /* On UP systems, spinlocks are effectively left out. */
 
-/* Allow the use of spinlock_t as an incomplete type. */
-typedef struct spinlock spinlock_t;
-
 #define SPINLOCK_DECLARE(name)
 #define SPINLOCK_EXTERN(name)
@@ -179 +177 @@
 
 #define spinlock_lock(lock)     preemption_disable()
-#define spinlock_trylock(lock)  ({ preemption_disable(); 1; })
+#define spinlock_trylock(lock)  (preemption_disable(), 1)
 #define spinlock_unlock(lock)   preemption_enable()
 #define spinlock_locked(lock)   1