summaryrefslogtreecommitdiff
path: root/kernel/sysctl.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2010-09-14 16:15:29 +0200
committerTakashi Iwai <tiwai@suse.de>2010-09-14 16:15:29 +0200
commitf3fbba6efbab93b9850821d41a75b02286d18315 (patch)
treee2a680674d334c6e455d1a89a4dbfc3f549cb6d1 /kernel/sysctl.c
parent15c5ab607045e278ebf4d2ca4aea2250617d50ca (diff)
parent147fcf1c211f1a87bf4d0711b7e9637f3d6ce080 (diff)
Merge branch 'fix/misc' into topic/misc
Diffstat (limited to 'kernel/sysctl.c')
-rw-r--r--kernel/sysctl.c5
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;
}