summaryrefslogtreecommitdiff
path: root/kernel/sysctl.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2010-10-13 15:44:24 +0200
committerIngo Molnar <mingo@elte.hu>2010-10-13 15:44:24 +0200
commit3d8a1a6a8af910cc2da566080d111e062a124ba6 (patch)
tree0c78b30a5c7aa083e215222989f982313c5141c0 /kernel/sysctl.c
parent1b13fe6a6e9986dbc079cbb05090be75edbffa5d (diff)
parent5d0d71569e671239ae0d905ced9b65cd843f99ee (diff)
Merge branch 'amd-iommu/2.6.37' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/linux-2.6-iommu into core/iommu
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;
}