1 files changed, 2 insertions, 11 deletions

diff --git a/kernel/audit.c b/kernel/audit.c
index f3a981db91ff..f8f203e8018c 100644
--- a/kernel/audit.c
+++ b/kernel/audit.c
@@ -499,7 +499,6 @@ static int kauditd_thread(void *dummy)
         set_freezable();
         while (!kthread_should_stop()) {
                 struct sk_buff *skb;
-                DECLARE_WAITQUEUE(wait, current);
 
                 flush_hold_queue();
 
@@ -514,16 +513,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;
 }
@@ -1667,7 +1658,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]);
         }
 }