diff options
| author | Ingo Molnar | 2015-10-19 10:09:54 +0200 |
|---|---|---|
| committer | Ingo Molnar | 2015-10-19 10:09:54 +0200 |
| commit | c13dc31adb04c3f85d54d2fa13e34206f25742eb (patch) | |
| tree | 09cf55d6f3cc628ac0a303c05dfdcc9af2ad803c /include/linux/sched.h | |
| parent | Linux 4.3-rc6 (diff) | |
| parent | Merge branches 'doc.2015.10.06a', 'percpu-rwsem.2015.10.06a' and 'torture.201... (diff) | |
| download | kernel-qcow2-linux-c13dc31adb04c3f85d54d2fa13e34206f25742eb.tar.gz kernel-qcow2-linux-c13dc31adb04c3f85d54d2fa13e34206f25742eb.tar.xz kernel-qcow2-linux-c13dc31adb04c3f85d54d2fa13e34206f25742eb.zip | |
Merge branch 'for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu into core/rcu
Pull RCU updates from Paul E. McKenney:
- Miscellaneous fixes. (Paul E. McKenney, Boqun Feng, Oleg Nesterov, Patrick Marlier)
- Improvements to expedited grace periods. (Paul E. McKenney)
- Performance improvements to and locktorture tests for percpu-rwsem.
(Oleg Nesterov, Paul E. McKenney)
- Torture-test changes. (Paul E. McKenney, Davidlohr Bueso)
- Documentation updates. (Paul E. McKenney)
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/linux/sched.h')
| -rw-r--r-- | include/linux/sched.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/include/linux/sched.h b/include/linux/sched.h index b7b9501b41af..aec904bc3da9 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h @@ -1342,10 +1342,12 @@ struct sched_dl_entity { union rcu_special { struct { - bool blocked; - bool need_qs; - } b; - short s; + u8 blocked; + u8 need_qs; + u8 exp_need_qs; + u8 pad; /* Otherwise the compiler can store garbage here. */ + } b; /* Bits. */ + u32 s; /* Set of bits. */ }; struct rcu_node; |