diff options
author | Ingo Molnar | 2016-05-12 09:18:13 +0200 |
---|---|---|
committer | Ingo Molnar | 2016-05-12 09:18:13 +0200 |
commit | eb60b3e5e8dfdd590e586a6fc22daf2f63a7b7e6 (patch) | |
tree | 1b06e2c1beca8f970685eb13096c7a12480526c6 /include/linux/lockdep.h | |
parent | sched/core: Fix comment typo in wake_q_add() (diff) | |
parent | Revert "sched/fair: Fix fairness issue on migration" (diff) | |
download | kernel-qcow2-linux-eb60b3e5e8dfdd590e586a6fc22daf2f63a7b7e6.tar.gz kernel-qcow2-linux-eb60b3e5e8dfdd590e586a6fc22daf2f63a7b7e6.tar.xz kernel-qcow2-linux-eb60b3e5e8dfdd590e586a6fc22daf2f63a7b7e6.zip |
Merge branch 'sched/urgent' into sched/core to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/linux/lockdep.h')
-rw-r--r-- | include/linux/lockdep.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/include/linux/lockdep.h b/include/linux/lockdep.h index cf9bf9612702..fb7d87e45fbe 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; }; |