diff options
Diffstat (limited to 'include/linux/lockdep.h')
-rw-r--r-- | include/linux/lockdep.h | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/include/linux/lockdep.h b/include/linux/lockdep.h index 819f08f1310d..498bfbd3b4e1 100644 --- a/include/linux/lockdep.h +++ b/include/linux/lockdep.h | |||
@@ -193,7 +193,6 @@ extern void lockdep_free_key_range(void *start, unsigned long size); | |||
193 | 193 | ||
194 | extern void lockdep_off(void); | 194 | extern void lockdep_off(void); |
195 | extern void lockdep_on(void); | 195 | extern void lockdep_on(void); |
196 | extern int lockdep_internal(void); | ||
197 | 196 | ||
198 | /* | 197 | /* |
199 | * These methods are used by specific locking variants (spinlocks, | 198 | * These methods are used by specific locking variants (spinlocks, |
@@ -243,6 +242,8 @@ extern void lock_release(struct lockdep_map *lock, int nested, | |||
243 | 242 | ||
244 | # define INIT_LOCKDEP .lockdep_recursion = 0, | 243 | # define INIT_LOCKDEP .lockdep_recursion = 0, |
245 | 244 | ||
245 | #define lockdep_depth(tsk) ((tsk)->lockdep_depth) | ||
246 | |||
246 | #else /* !LOCKDEP */ | 247 | #else /* !LOCKDEP */ |
247 | 248 | ||
248 | static inline void lockdep_off(void) | 249 | static inline void lockdep_off(void) |
@@ -253,11 +254,6 @@ static inline void lockdep_on(void) | |||
253 | { | 254 | { |
254 | } | 255 | } |
255 | 256 | ||
256 | static inline int lockdep_internal(void) | ||
257 | { | ||
258 | return 0; | ||
259 | } | ||
260 | |||
261 | # define lock_acquire(l, s, t, r, c, i) do { } while (0) | 257 | # define lock_acquire(l, s, t, r, c, i) do { } while (0) |
262 | # define lock_release(l, n, i) do { } while (0) | 258 | # define lock_release(l, n, i) do { } while (0) |
263 | # define lockdep_init() do { } while (0) | 259 | # define lockdep_init() do { } while (0) |
@@ -277,6 +273,9 @@ static inline int lockdep_internal(void) | |||
277 | * The class key takes no space if lockdep is disabled: | 273 | * The class key takes no space if lockdep is disabled: |
278 | */ | 274 | */ |
279 | struct lock_class_key { }; | 275 | struct lock_class_key { }; |
276 | |||
277 | #define lockdep_depth(tsk) (0) | ||
278 | |||
280 | #endif /* !LOCKDEP */ | 279 | #endif /* !LOCKDEP */ |
281 | 280 | ||
282 | #if defined(CONFIG_TRACE_IRQFLAGS) && defined(CONFIG_GENERIC_HARDIRQS) | 281 | #if defined(CONFIG_TRACE_IRQFLAGS) && defined(CONFIG_GENERIC_HARDIRQS) |