diff options
Diffstat (limited to 'kernel/mutex-debug.h')
-rw-r--r-- | kernel/mutex-debug.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/kernel/mutex-debug.h b/kernel/mutex-debug.h index a5196c36a5fd..8417b52ebd65 100644 --- a/kernel/mutex-debug.h +++ b/kernel/mutex-debug.h | |||
@@ -65,10 +65,10 @@ extern void debug_mutex_init(struct mutex *lock, const char *name); | |||
65 | do { \ | 65 | do { \ |
66 | struct mutex *l = container_of(lock, struct mutex, wait_lock); \ | 66 | struct mutex *l = container_of(lock, struct mutex, wait_lock); \ |
67 | \ | 67 | \ |
68 | DEBUG_WARN_ON(in_interrupt()); \ | 68 | DEBUG_LOCKS_WARN_ON(in_interrupt()); \ |
69 | debug_spin_lock_save(&debug_mutex_lock, flags); \ | 69 | debug_spin_lock_save(&debug_mutex_lock, flags); \ |
70 | spin_lock(lock); \ | 70 | spin_lock(lock); \ |
71 | DEBUG_WARN_ON(l->magic != l); \ | 71 | DEBUG_LOCKS_WARN_ON(l->magic != l); \ |
72 | } while (0) | 72 | } while (0) |
73 | 73 | ||
74 | #define spin_unlock_mutex(lock, flags) \ | 74 | #define spin_unlock_mutex(lock, flags) \ |
@@ -95,7 +95,7 @@ do { \ | |||
95 | } \ | 95 | } \ |
96 | } while (0) | 96 | } while (0) |
97 | 97 | ||
98 | #define DEBUG_WARN_ON(c) \ | 98 | #define DEBUG_LOCKS_WARN_ON(c) \ |
99 | do { \ | 99 | do { \ |
100 | if (unlikely(c && debug_mutex_on)) { \ | 100 | if (unlikely(c && debug_mutex_on)) { \ |
101 | DEBUG_OFF(); \ | 101 | DEBUG_OFF(); \ |
@@ -110,10 +110,10 @@ do { \ | |||
110 | } while (0) | 110 | } while (0) |
111 | 111 | ||
112 | #ifdef CONFIG_SMP | 112 | #ifdef CONFIG_SMP |
113 | # define SMP_DEBUG_WARN_ON(c) DEBUG_WARN_ON(c) | 113 | # define SMP_DEBUG_LOCKS_WARN_ON(c) DEBUG_LOCKS_WARN_ON(c) |
114 | # define SMP_DEBUG_BUG_ON(c) DEBUG_BUG_ON(c) | 114 | # define SMP_DEBUG_BUG_ON(c) DEBUG_BUG_ON(c) |
115 | #else | 115 | #else |
116 | # define SMP_DEBUG_WARN_ON(c) do { } while (0) | 116 | # define SMP_DEBUG_LOCKS_WARN_ON(c) do { } while (0) |
117 | # define SMP_DEBUG_BUG_ON(c) do { } while (0) | 117 | # define SMP_DEBUG_BUG_ON(c) do { } while (0) |
118 | #endif | 118 | #endif |
119 | 119 | ||