summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2016-04-28 19:59:17 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2016-04-28 19:59:17 -0700
commit2113caed87dd372e5ca2d9b3cba415f4da38936b (patch)
treea8ce1b6b1653323e11d7152f2900f66bbd4bdca4 /include
parent8f3603a210970d665e7cecf6623331ce6b24f713 (diff)
parent75dd602a5198a6e5f75534db52b6e6fbaabb33d1 (diff)
downloadlinux-2113caed87dd372e5ca2d9b3cba415f4da38936b.tar.bz2
Merge branch 'locking-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull locking fixes from Ingo Molnar: "Two lockdep fixes" * 'locking-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: lockdep: Fix lock_chain::base size locking/lockdep: Fix ->irq_context calculation
Diffstat (limited to 'include')
-rw-r--r--include/linux/lockdep.h8
1 files changed, 5 insertions, 3 deletions
diff --git a/include/linux/lockdep.h b/include/linux/lockdep.h
index d026b190c530..d10ef06971b5 100644
--- a/include/linux/lockdep.h
+++ b/include/linux/lockdep.h
@@ -196,9 +196,11 @@ struct lock_list {
* We record lock dependency chains, so that we can cache them:
*/
struct lock_chain {
- u8 irq_context;
- u8 depth;
- u16 base;
+ /* see BUILD_BUG_ON()s in lookup_chain_cache() */
+ unsigned int irq_context : 2,
+ depth : 6,
+ base : 24;
+ /* 4 byte hole */
struct hlist_node entry;
u64 chain_key;
};