Merge commit 'v3.5-rc5' into next

1 files changed, 2 insertions, 4 deletions

diff --git a/security/selinux/netnode.c b/security/selinux/netnode.c
index 86365857c088..28f911cdd7c7 100644
--- a/security/selinux/netnode.c
+++ b/security/selinux/netnode.c
@@ -297,8 +297,7 @@ static void sel_netnode_flush(void)
         spin_unlock_bh(&sel_netnode_lock);
 }
 
-static int sel_netnode_avc_callback(u32 event, u32 ssid, u32 tsid,
-                                    u16 class, u32 perms, u32 *retained)
+static int sel_netnode_avc_callback(u32 event)
 {
         if (event == AVC_CALLBACK_RESET) {
                 sel_netnode_flush();
@@ -320,8 +319,7 @@ static __init int sel_netnode_init(void)
                 sel_netnode_hash[iter].size = 0;
         }
 
-        ret = avc_add_callback(sel_netnode_avc_callback, AVC_CALLBACK_RESET,
-                               SECSID_NULL, SECSID_NULL, SECCLASS_NULL, 0);
+        ret = avc_add_callback(sel_netnode_avc_callback, AVC_CALLBACK_RESET);
         if (ret != 0)
                 panic("avc_add_callback() failed, error %d\n", ret);