diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-10-13 15:44:12 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-10-13 15:44:12 +0200 |
| commit | d6dd50e07c5bec00db2005969b1a01f8ca3d25ef (patch) | |
| tree | 53e36ac30a3d0fdca3834f4e1eb36ddc67b512ce /kernel/sysctl.c | |
| parent | 5ff0b9e1a1da58b584aa4b8ea234be20b5a1164b (diff) | |
| parent | fd19bda491207f66d39aeba93487197a087bc00b (diff) | |
| download | linux-d6dd50e07c5bec00db2005969b1a01f8ca3d25ef.tar.gz linux-d6dd50e07c5bec00db2005969b1a01f8ca3d25ef.tar.bz2 linux-d6dd50e07c5bec00db2005969b1a01f8ca3d25ef.zip | |
Merge branch 'core-rcu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull RCU updates from Ingo Molnar:
"The main changes in this cycle were:
- changes related to No-CBs CPUs and NO_HZ_FULL
- RCU-tasks implementation
- torture-test updates
- miscellaneous fixes
- locktorture updates
- RCU documentation updates"
* 'core-rcu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (81 commits)
workqueue: Use cond_resched_rcu_qs macro
workqueue: Add quiescent state between work items
locktorture: Cleanup header usage
locktorture: Cannot hold read and write lock
locktorture: Fix __acquire annotation for spinlock irq
locktorture: Support rwlocks
rcu: Eliminate deadlock between CPU hotplug and expedited grace periods
locktorture: Document boot/module parameters
rcutorture: Rename rcutorture_runnable parameter
locktorture: Add test scenario for rwsem_lock
locktorture: Add test scenario for mutex_lock
locktorture: Make torture scripting account for new _runnable name
locktorture: Introduce torture context
locktorture: Support rwsems
locktorture: Add infrastructure for torturing read locks
torture: Address race in module cleanup
locktorture: Make statistics generic
locktorture: Teach about lock debugging
locktorture: Support mutexes
locktorture: Add documentation
...
Diffstat (limited to 'kernel/sysctl.c')
| -rw-r--r-- | kernel/sysctl.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/kernel/sysctl.c b/kernel/sysctl.c index 91180987e40e..4aada6d9fe74 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c @@ -1055,15 +1055,6 @@ static struct ctl_table kern_table[] = { .child = key_sysctls, }, #endif -#ifdef CONFIG_RCU_TORTURE_TEST - { - .procname = "rcutorture_runnable", - .data = &rcutorture_runnable, - .maxlen = sizeof(int), - .mode = 0644, - .proc_handler = proc_dointvec, - }, -#endif #ifdef CONFIG_PERF_EVENTS /* * User-space scripts rely on the existence of this file |