diff options
author | James Morris <jmorris@namei.org> | 2008-12-24 19:40:09 -0500 |
---|---|---|
committer | James Morris <jmorris@namei.org> | 2008-12-24 19:40:09 -0500 |
commit | cbacc2c7f066a1e01b33b0e27ae5efbf534bc2db (patch) | |
tree | 90d1093131d2a3543a8b3b1f3364e7c6f4081a93 /kernel/sysctl.c | |
parent | 4a6908a3a050aacc9c3a2f36b276b46c0629ad91 (diff) | |
parent | 74192246910ff4fb95309ba1a683215644beeb62 (diff) |
Merge branch 'next' into for-linus
Diffstat (limited to 'kernel/sysctl.c')
-rw-r--r-- | kernel/sysctl.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/sysctl.c b/kernel/sysctl.c index 3d56fe7570da..9d52b57310af 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c | |||
@@ -1651,7 +1651,7 @@ out: | |||
1651 | 1651 | ||
1652 | static int test_perm(int mode, int op) | 1652 | static int test_perm(int mode, int op) |
1653 | { | 1653 | { |
1654 | if (!current->euid) | 1654 | if (!current_euid()) |
1655 | mode >>= 6; | 1655 | mode >>= 6; |
1656 | else if (in_egroup_p(0)) | 1656 | else if (in_egroup_p(0)) |
1657 | mode >>= 3; | 1657 | mode >>= 3; |