Changeset c47e1a8 in mainline for kernel/generic/include/synch/spinlock.h

Timestamp:

2010-05-21T07:50:04Z (16 years ago)

Author:

Lenka Trochtova <trochtova.lenka@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

d51ee2b

Parents:

cf8cc36 (diff), 15b592b (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

merge mainline changes (rev. 451)

File:

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

kernel/generic/include/synch/spinlock.h

@@ -36 +36 @@
 #define KERN_SPINLOCK_H_
 
-#include <arch/types.h>
+#include <typedefs.h>
 #include <arch/barrier.h>
 #include <preemption.h>
@@ -48 +48 @@
         
 #ifdef CONFIG_DEBUG_SPINLOCK
-        char *name;
+        const char *name;
 #endif
 } spinlock_t;
@@ -77 +77 @@
         }
 
-#define spinlock_lock(lock)  spinlock_lock_debug(lock)
+#define spinlock_lock(lock)     spinlock_lock_debug((lock))
+#define spinlock_unlock(lock)   spinlock_unlock_debug((lock))
 
 #else
@@ -91 +92 @@
         }
 
-#define spinlock_lock(lock)  atomic_lock_arch(&(lock)->val)
+#define spinlock_lock(lock)     atomic_lock_arch(&(lock)->val)
+#define spinlock_unlock(lock)   spinlock_unlock_nondebug((lock))
 
 #endif
@@ -101 +103 @@
         SPINLOCK_STATIC_INITIALIZE_NAME(lock_name, #lock_name)
 
-extern void spinlock_initialize(spinlock_t *lock, char *name);
+extern void spinlock_initialize(spinlock_t *lock, const char *name);
 extern int spinlock_trylock(spinlock_t *lock);
 extern void spinlock_lock_debug(spinlock_t *lock);
+extern void spinlock_unlock_debug(spinlock_t *lock);
 
 /** Unlock spinlock
  *
- * Unlock spinlock.
+ * Unlock spinlock for non-debug kernels.
  *
  * @param sl Pointer to spinlock_t structure.
  */
-static inline void spinlock_unlock(spinlock_t *lock)
+static inline void spinlock_unlock_nondebug(spinlock_t *lock)
 {
-        ASSERT(atomic_get(&lock->val) != 0);
-        
         /*
          * Prevent critical section code from bleeding out this way down.