diff options
| author | Ingo Molnar | 2019-06-28 19:46:47 +0200 |
|---|---|---|
| committer | Ingo Molnar | 2019-06-28 19:46:47 +0200 |
| commit | 83086d654dd08c0f57381522e6819f421677706e (patch) | |
| tree | bcb3d6f66916134de1a86c67db8a5829e3885ef3 /include/linux/sched.h | |
| parent | Merge tag 'clk-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/... (diff) | |
| parent | Merge LKMM and RCU commits (diff) | |
| download | kernel-qcow2-linux-83086d654dd08c0f57381522e6819f421677706e.tar.gz kernel-qcow2-linux-83086d654dd08c0f57381522e6819f421677706e.tar.xz kernel-qcow2-linux-83086d654dd08c0f57381522e6819f421677706e.zip | |
Merge branch 'for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu into core/rcu
Pull rcu/next + tools/memory-model changes from Paul E. McKenney:
- RCU flavor consolidation cleanups and optmizations
- Documentation updates
- Miscellaneous fixes
- SRCU updates
- RCU-sync flavor consolidation
- Torture-test updates
- Linux-kernel memory-consistency-model updates, most notably the addition of plain C-language accesses
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/linux/sched.h')
| -rw-r--r-- | include/linux/sched.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/sched.h b/include/linux/sched.h index 11837410690f..942a44c1b8eb 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h @@ -565,7 +565,7 @@ union rcu_special { u8 blocked; u8 need_qs; u8 exp_hint; /* Hint for performance. */ - u8 pad; /* No garbage from compiler! */ + u8 deferred_qs; } b; /* Bits. */ u32 s; /* Set of bits. */ }; |