git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to kernel-2.6.20-1.2949.fc6.vs2.2.0.1
[linux-2.6.git]
/
include
/
linux
/
spinlock_types_up.h
diff --git
a/include/linux/spinlock_types_up.h
b/include/linux/spinlock_types_up.h
index
04135b0
..
27644af
100644
(file)
--- a/
include/linux/spinlock_types_up.h
+++ b/
include/linux/spinlock_types_up.h
@@
-12,10
+12,14
@@
* Released under the General Public License (GPL).
*/
* Released under the General Public License (GPL).
*/
-#ifdef CONFIG_DEBUG_SPINLOCK
+#if defined(CONFIG_DEBUG_SPINLOCK) || \
+ defined(CONFIG_DEBUG_LOCK_ALLOC)
typedef struct {
volatile unsigned int slock;
typedef struct {
volatile unsigned int slock;
+#ifdef CONFIG_DEBUG_LOCK_ALLOC
+ struct lockdep_map dep_map;
+#endif
} raw_spinlock_t;
#define __RAW_SPIN_LOCK_UNLOCKED { 1 }
} raw_spinlock_t;
#define __RAW_SPIN_LOCK_UNLOCKED { 1 }
@@
-30,6
+34,9
@@
typedef struct { } raw_spinlock_t;
typedef struct {
/* no debug version on UP */
typedef struct {
/* no debug version on UP */
+#ifdef CONFIG_DEBUG_LOCK_ALLOC
+ struct lockdep_map dep_map;
+#endif
} raw_rwlock_t;
#define __RAW_RW_LOCK_UNLOCKED { }
} raw_rwlock_t;
#define __RAW_RW_LOCK_UNLOCKED { }