diff options
| author | Paul E. McKenney <paulmck@linux.vnet.ibm.com> | 2012-11-16 18:59:58 +0100 |
|---|---|---|
| committer | Paul E. McKenney <paulmck@linux.vnet.ibm.com> | 2012-11-16 18:59:58 +0100 |
| commit | aac1cda34b84a9411d6b8d18c3658f094c834911 (patch) | |
| tree | 60cc2e3d6793fdbf8b13704608aafdf01bcec118 /kernel/rcutree.c | |
| parent | rcu: Fix unrecovered RCU user mode in syscall_trace_leave() (diff) | |
| parent | rcu: Add documentation for the new rcuexp debugfs trace file (diff) | |
| parent | rcu: Fix TINY_RCU rcu_is_cpu_rrupt_from_idle check (diff) | |
| parent | rcutorture: Use DEFINE_STATIC_SRCU() (diff) | |
| parent | rcu: Reduce default RCU CPU stall warning timeout (diff) | |
| parent | rcu: Add tracing for synchronize_sched_expedited() (diff) | |
| parent | rcu: Wordsmith help text for RCU_USER_QS kernel parameter (diff) | |
| download | linux-aac1cda34b84a9411d6b8d18c3658f094c834911.tar.xz linux-aac1cda34b84a9411d6b8d18c3658f094c834911.zip | |
Merge branches 'urgent.2012.10.27a', 'doc.2012.11.16a', 'fixes.2012.11.13a', 'srcu.2012.10.27a', 'stall.2012.11.13a', 'tracing.2012.11.08a' and 'idle.2012.10.24a' into HEAD
urgent.2012.10.27a: Fix for RCU user-mode transition (already in -tip).
doc.2012.11.08a: Documentation updates, most notably codifying the
memory-barrier guarantees inherent to grace periods.
fixes.2012.11.13a: Miscellaneous fixes.
srcu.2012.10.27a: Allow statically allocated and initialized srcu_struct
structures (courtesy of Lai Jiangshan).
stall.2012.11.13a: Add more diagnostic information to RCU CPU stall
warnings, also decrease from 60 seconds to 21 seconds.
hotplug.2012.11.08a: Minor updates to CPU hotplug handling.
tracing.2012.11.08a: Improved debugfs tracing, courtesy of Michael Wang.
idle.2012.10.24a: Updates to RCU idle/adaptive-idle handling, including
a boot parameter that maps normal grace periods to expedited.
Resolved conflict in kernel/rcutree.c due to side-by-side change.