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

Timestamp:

2010-03-27T09:22:17Z (16 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

36a75a2

Parents:

cd82bb1 (diff), eaf22d4 (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.

File:

• kernel/generic/include/synch/spinlock.h (modified) (3 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;
@@ -101 +101 @@
         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);