Merge branch 'core-rcu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[deliverable/linux.git] / include / linux / lockdep.h

diff --git a/include/linux/lockdep.h b/include/linux/lockdep.h
index 008388f920d7e93e32ba388dd4b497f33d7bd49d..72d6dea7fac1acd6a0e7863e4579f111f781cbc5 100644 (file)
--- a/include/linux/lockdep.h
+++ b/include/linux/lockdep.h
@@ -362,6 +362,10 @@ extern void lockdep_trace_alloc(gfp_t mask);
                WARN_ON(debug_locks && !lockdep_is_held(l));    \
        } while (0)
 
+#define lockdep_assert_held_once(l)    do {                            \
+               WARN_ON_ONCE(debug_locks && !lockdep_is_held(l));       \
+       } while (0)
+
 #define lockdep_recursing(tsk) ((tsk)->lockdep_recursion)
 
 #else /* !CONFIG_LOCKDEP */
@@ -412,6 +416,7 @@ struct lock_class_key { };
 #define lockdep_depth(tsk)     (0)
 
 #define lockdep_assert_held(l)                 do { (void)(l); } while (0)
+#define lockdep_assert_held_once(l)            do { (void)(l); } while (0)
 
 #define lockdep_recursing(tsk)                 (0)
 
@@ -505,6 +510,7 @@ static inline void print_irqtrace_events(struct task_struct *curr)
 
 #define lock_map_acquire(l)                    lock_acquire_exclusive(l, 0, 0, NULL, _THIS_IP_)
 #define lock_map_acquire_read(l)               lock_acquire_shared_recursive(l, 0, 0, NULL, _THIS_IP_)
+#define lock_map_acquire_tryread(l)            lock_acquire_shared_recursive(l, 0, 1, NULL, _THIS_IP_)
 #define lock_map_release(l)                    lock_release(l, 1, _THIS_IP_)
 
 #ifdef CONFIG_PROVE_LOCKING