Merge branch 'next' into for-linus
[linux-2.6.git] / kernel / capability.c
index c598d9d..688926e 100644 (file)
@@ -306,7 +306,7 @@ int capable(int cap)
                BUG();
        }
 
-       if (has_capability(current, cap)) {
+       if (security_capable(cap) == 0) {
                current->flags |= PF_SUPERPRIV;
                return 1;
        }