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
Showing the changes to include/linux (1 of 3 files). Show all
Unified · Split
| @@ -196,9 +196,11 @@ struct lock_list { · 195 unmodified lines | ||
| 196 | 196 | * We record lock dependency chains, so that we can cache them: |
| 197 | 197 | */ |
| 198 | 198 | struct lock_chain { |
| 199 | − u8 irq_context; | |
| 200 | − u8 depth; | |
| 201 | − u16 base; | |
| 199 | + /* see BUILD_BUG_ON()s in lookup_chain_cache() */ | |
| 200 | + unsigned int irq_context : 2, | |
| 201 | + depth : 6, | |
| 202 | + base : 24; | |
| 203 | + /* 4 byte hole */ | |
| 202 | 204 | struct hlist_node entry; |
| 203 | 205 | u64 chain_key; |
| 204 | 206 | }; |