Merge tag 'for-linus' of git://github.com/prasad-joshi/logfs_upstream

[sfrench/cifs-2.6.git] / security / capability.c

diff --git a/security/capability.c b/security/capability.c
index 3b5883b7179f4ca3c848c912f692a5e9bc50dc2b..2f680eb02b59e3f08a437f97d963eac100b3b3ea 100644 (file)
--- a/security/capability.c
+++ b/security/capability.c
@@ -998,7 +998,6 @@ void __init security_fixup_ops(struct security_operations *ops)
        set_to_cap_if_null(ops, sem_semctl);
        set_to_cap_if_null(ops, sem_semop);
        set_to_cap_if_null(ops, netlink_send);
-       set_to_cap_if_null(ops, netlink_recv);
        set_to_cap_if_null(ops, d_instantiate);
        set_to_cap_if_null(ops, getprocattr);
        set_to_cap_if_null(ops, setprocattr);