drm/i915: Resolve interaction with drm-fixes tree

[karo-tx-linux.git] / security / selinux / netport.c

diff --git a/security/selinux/netport.c b/security/selinux/netport.c
index 7b9eb1faf68b5fe435b7f70e36ff21330934d6a2..d35379781c2c44ab188cb7aed071579da189bb53 100644 (file)
--- a/security/selinux/netport.c
+++ b/security/selinux/netport.c
@@ -234,8 +234,7 @@ static void sel_netport_flush(void)
        spin_unlock_bh(&sel_netport_lock);
 }
 
-static int sel_netport_avc_callback(u32 event, u32 ssid, u32 tsid,
-                                   u16 class, u32 perms, u32 *retained)
+static int sel_netport_avc_callback(u32 event)
 {
        if (event == AVC_CALLBACK_RESET) {
                sel_netport_flush();
@@ -257,8 +256,7 @@ static __init int sel_netport_init(void)
                sel_netport_hash[iter].size = 0;
        }
 
-       ret = avc_add_callback(sel_netport_avc_callback, AVC_CALLBACK_RESET,
-                              SECSID_NULL, SECSID_NULL, SECCLASS_NULL, 0);
+       ret = avc_add_callback(sel_netport_avc_callback, AVC_CALLBACK_RESET);
        if (ret != 0)
                panic("avc_add_callback() failed, error %d\n", ret);