Merge branch 'next' into for-linus

2009-01-07 09:58:22 +11:00
parent 238c6d5483 3699c53c48
commit ac8cc0fa53
26 changed files with 1231 additions and 425 deletions
--- a/kernel/capability.c
+++ b/kernel/capability.c
@@ -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;
 	}