X-Git-Url: http://pilppa.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=security%2Fcapability.c;h=2458748190361328b3862092c82563fbb587bcf1;hb=0ddbccd1187e12bf77e1f19d8b9dec700e09e734;hp=5b01c0b02422b28a1809ba7be383e1b93e76159f;hpb=dc221eae08eea3b0db127d1f152fac24d10b6a52;p=linux-2.6-omap-h63xx.git

diff --git a/security/capability.c b/security/capability.c
index 5b01c0b0242..24587481903 100644
--- a/security/capability.c
+++ b/security/capability.c
@@ -211,8 +211,7 @@ static int cap_inode_follow_link(struct dentry *dentry,
 	return 0;
 }
 
-static int cap_inode_permission(struct inode *inode, int mask,
-				struct nameidata *nd)
+static int cap_inode_permission(struct inode *inode, int mask)
 {
 	return 0;
 }
@@ -812,7 +811,8 @@ struct security_operations default_security_ops = {
 
 void security_fixup_ops(struct security_operations *ops)
 {
-	set_to_cap_if_null(ops, ptrace);
+	set_to_cap_if_null(ops, ptrace_may_access);
+	set_to_cap_if_null(ops, ptrace_traceme);
 	set_to_cap_if_null(ops, capget);
 	set_to_cap_if_null(ops, capset_check);
 	set_to_cap_if_null(ops, capset_set);