diff options
| author | Eric Paris <eparis@redhat.com> | 2011-05-26 23:20:14 +0200 |
|---|---|---|
| committer | Eric Paris <eparis@redhat.com> | 2011-05-26 23:20:14 +0200 |
| commit | ea77f7a2e8561012cf100c530170f12351c3b53e (patch) | |
| tree | 7302ac1064f4e364aadda84020a176804fb86e22 /security/capability.c | |
| parent | SELINUX: add /sys/fs/selinux mount point to put selinuxfs (diff) | |
| parent | Linux 2.6.39 (diff) | |
| download | linux-ea77f7a2e8561012cf100c530170f12351c3b53e.tar.xz linux-ea77f7a2e8561012cf100c530170f12351c3b53e.zip | |
Merge commit 'v2.6.39' into 20110526
Conflicts:
lib/flex_array.c
security/selinux/avc.c
security/selinux/hooks.c
security/selinux/ss/policydb.c
security/smack/smack_lsm.c
Diffstat (limited to 'security/capability.c')
| -rw-r--r-- | security/capability.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/security/capability.c b/security/capability.c index 56bb1605fd79..bbb51156261b 100644 --- a/security/capability.c +++ b/security/capability.c @@ -761,7 +761,7 @@ static int cap_xfrm_policy_lookup(struct xfrm_sec_ctx *ctx, u32 sk_sid, u8 dir) static int cap_xfrm_state_pol_flow_match(struct xfrm_state *x, struct xfrm_policy *xp, - struct flowi *fl) + const struct flowi *fl) { return 1; } |