Merge branch 'linus' into locking/core, to pick up fixes

[people/arne_f/kernel.git] / include / linux / sched.h

diff --git a/include/linux/sched.h b/include/linux/sched.h
index c05ac5f5aa034db128e9abcdd02e176f21904b8b..93be319e0cbf7eb83d4c61b3f67ade790b66ef03 100644 (file)
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -846,7 +846,17 @@ struct task_struct {
        int                             lockdep_depth;
        unsigned int                    lockdep_recursion;
        struct held_lock                held_locks[MAX_LOCK_DEPTH];
-       gfp_t                           lockdep_reclaim_gfp;
+#endif
+
+#ifdef CONFIG_LOCKDEP_CROSSRELEASE
+#define MAX_XHLOCKS_NR 64UL
+       struct hist_lock *xhlocks; /* Crossrelease history locks */
+       unsigned int xhlock_idx;
+       /* For restoring at history boundaries */
+       unsigned int xhlock_idx_hist[XHLOCK_CTX_NR];
+       unsigned int hist_id;
+       /* For overwrite check at each context exit */
+       unsigned int hist_id_save[XHLOCK_CTX_NR];
 #endif
 
 #ifdef CONFIG_UBSAN