diff options
author | 2010-10-07 09:43:11 +0200 | |
---|---|---|
committer | 2010-10-07 09:43:11 +0200 | |
commit | d4f8f217b8a5d5bd02af979650418dca4caec472 (patch) | |
tree | af047bfa9729c975e24cb7624107574e884d3a57 /kernel/sysctl.c | |
parent | rcu: Add advice to PROVE_RCU_REPEATEDLY kernel config parameter (diff) | |
parent | rcu: move check from rcu_dereference_bh to rcu_read_lock_bh_held (diff) | |
download | linux-dev-d4f8f217b8a5d5bd02af979650418dca4caec472.tar.xz linux-dev-d4f8f217b8a5d5bd02af979650418dca4caec472.zip |
Merge branch 'rcu/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-2.6-rcu into core/rcu
Diffstat (limited to 'kernel/sysctl.c')
-rw-r--r-- | kernel/sysctl.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/kernel/sysctl.c b/kernel/sysctl.c index ca38e8e3e907..f88552c6d227 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c @@ -1713,10 +1713,7 @@ static __init int sysctl_init(void) { sysctl_set_parent(NULL, root_table); #ifdef CONFIG_SYSCTL_SYSCALL_CHECK - { - int err; - err = sysctl_check_table(current->nsproxy, root_table); - } + sysctl_check_table(current->nsproxy, root_table); #endif return 0; } |