Merge branch 'master' into next

[linux-2.6-block.git] / kernel / sysctl.c

diff --git a/kernel/sysctl.c b/kernel/sysctl.c
index 3d56fe7570daede300fe01f2e6571416107b081b..9d52b57310af1fe953a8f86bdaf35d9ca88acbb7 100644 (file)
--- a/kernel/sysctl.c
+++ b/kernel/sysctl.c
@@ -1651,7 +1651,7 @@ out:
 
 static int test_perm(int mode, int op)
 {
-       if (!current->euid)
+       if (!current_euid())
                mode >>= 6;
        else if (in_egroup_p(0))
                mode >>= 3;