Merge branch 'sched/urgent' into sched/core to pick up fixes

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

diff --git a/include/linux/lockdep.h b/include/linux/lockdep.h
index d10ef06..fb7d87e 100644 (file)
--- a/include/linux/lockdep.h
+++ b/include/linux/lockdep.h
@@ -356,8 +356,13 @@ extern void lockdep_set_current_reclaim_state(gfp_t gfp_mask);
 extern void lockdep_clear_current_reclaim_state(void);
 extern void lockdep_trace_alloc(gfp_t mask);
 
-extern void lock_pin_lock(struct lockdep_map *lock);
-extern void lock_unpin_lock(struct lockdep_map *lock);
+struct pin_cookie { unsigned int val; };
+
+#define NIL_COOKIE (struct pin_cookie){ .val = 0U, }
+
+extern struct pin_cookie lock_pin_lock(struct lockdep_map *lock);
+extern void lock_repin_lock(struct lockdep_map *lock, struct pin_cookie);
+extern void lock_unpin_lock(struct lockdep_map *lock, struct pin_cookie);
 
 # define INIT_LOCKDEP                          .lockdep_recursion = 0, .lockdep_reclaim_gfp = 0,
 
@@ -373,8 +378,9 @@ extern void lock_unpin_lock(struct lockdep_map *lock);
 
 #define lockdep_recursing(tsk) ((tsk)->lockdep_recursion)
 
-#define lockdep_pin_lock(l)            lock_pin_lock(&(l)->dep_map)
-#define lockdep_unpin_lock(l)  lock_unpin_lock(&(l)->dep_map)
+#define lockdep_pin_lock(l)    lock_pin_lock(&(l)->dep_map)
+#define lockdep_repin_lock(l,c)        lock_repin_lock(&(l)->dep_map, (c))
+#define lockdep_unpin_lock(l,c)        lock_unpin_lock(&(l)->dep_map, (c))
 
 #else /* !CONFIG_LOCKDEP */
 
@@ -427,8 +433,13 @@ struct lock_class_key { };
 
 #define lockdep_recursing(tsk)                 (0)
 
-#define lockdep_pin_lock(l)                            do { (void)(l); } while (0)
-#define lockdep_unpin_lock(l)                  do { (void)(l); } while (0)
+struct pin_cookie { };
+
+#define NIL_COOKIE (struct pin_cookie){ }
+
+#define lockdep_pin_lock(l)                    ({ struct pin_cookie cookie; cookie; })
+#define lockdep_repin_lock(l, c)               do { (void)(l); (void)(c); } while (0)
+#define lockdep_unpin_lock(l, c)               do { (void)(l); (void)(c); } while (0)
 
 #endif /* !LOCKDEP */