git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph...
[pandora-kernel.git]
/
security
/
capability.c
diff --git
a/security/capability.c
b/security/capability.c
index
2984ea4
..
bbb5115
100644
(file)
--- a/
security/capability.c
+++ b/
security/capability.c
@@
-181,7
+181,7
@@
static int cap_inode_follow_link(struct dentry *dentry,
return 0;
}
-static int cap_inode_permission(struct inode *inode, int mask)
+static int cap_inode_permission(struct inode *inode, int mask
, unsigned flags
)
{
return 0;
}