diff options
| author | Paul E. McKenney <paulmck@linux.vnet.ibm.com> | 2012-11-16 09:59:58 -0800 |
|---|---|---|
| committer | Paul E. McKenney <paulmck@linux.vnet.ibm.com> | 2012-11-16 09:59:58 -0800 |
| commit | aac1cda34b84a9411d6b8d18c3658f094c834911 (patch) | |
| tree | 60cc2e3d6793fdbf8b13704608aafdf01bcec118 | |
| parent | 2c5594df344cd1ff0cc9bf007dea3235582b3acf (diff) | |
| parent | d484a215139cf556cb718a7ec7042260b7fc2d28 (diff) | |
| parent | 351573a86d0ef17cbba1c5436706602692781bfe (diff) | |
| parent | cda4dc813071e6cb04944c5a140610bd06acd295 (diff) | |
| parent | c896054f75f9a720ecf2ab3e688f4da79a55fe05 (diff) | |
| parent | 7bd8f2a74bcbd39f4277766f4d49441c45dd10a0 (diff) | |
| parent | af71befa282ddf51c09509978abe1e83de8fe7eb (diff) | |
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.