Merge branch 'upstream' of git://git.infradead.org/users/pcmoore/audit

[cascardo/linux.git] / kernel / audit.c

diff --git a/kernel/audit.c b/kernel/audit.c
index d5a1220..ab5745d 100644 (file)
--- a/kernel/audit.c
+++ b/kernel/audit.c
@@ -501,7 +501,6 @@ static int kauditd_thread(void *dummy)
        set_freezable();
        while (!kthread_should_stop()) {
                struct sk_buff *skb;
-               DECLARE_WAITQUEUE(wait, current);
 
                flush_hold_queue();
 
@@ -516,16 +515,8 @@ static int kauditd_thread(void *dummy)
                                audit_printk_skb(skb);
                        continue;
                }
-               set_current_state(TASK_INTERRUPTIBLE);
-               add_wait_queue(&kauditd_wait, &wait);
 
-               if (!skb_queue_len(&audit_skb_queue)) {
-                       try_to_freeze();
-                       schedule();
-               }
-
-               __set_current_state(TASK_RUNNING);
-               remove_wait_queue(&kauditd_wait, &wait);
+               wait_event_freezable(kauditd_wait, skb_queue_len(&audit_skb_queue));
        }
        return 0;
 }
@@ -1110,7 +1101,7 @@ static void audit_receive(struct sk_buff  *skb)
 }
 
 /* Run custom bind function on netlink socket group connect or bind requests. */
-static int audit_bind(int group)
+static int audit_bind(struct net *net, int group)
 {
        if (!capable(CAP_AUDIT_READ))
                return -EPERM;
@@ -1669,7 +1660,7 @@ void audit_log_cap(struct audit_buffer *ab, char *prefix, kernel_cap_t *cap)
        audit_log_format(ab, " %s=", prefix);
        CAP_FOR_EACH_U32(i) {
                audit_log_format(ab, "%08x",
-                                cap->cap[(_KERNEL_CAPABILITY_U32S-1) - i]);
+                                cap->cap[CAP_LAST_U32 - i]);
        }
 }