2 files changed, 3 insertions, 2 deletions

diff --git a/kernel/audit.c b/kernel/audit.c
index f9889ee778..98106f6078 100644
--- a/kernel/audit.c
+++ b/kernel/audit.c
@@ -340,7 +340,7 @@ static int kauditd_thread(void *dummy)
 {
         struct sk_buff *skb;
 
-        while (1) {
+        while (!kthread_should_stop()) {
                 skb = skb_dequeue(&audit_skb_queue);
                 wake_up(&audit_backlog_wait);
                 if (skb) {
@@ -369,6 +369,7 @@ static int kauditd_thread(void *dummy)
                         remove_wait_queue(&kauditd_wait, &wait);
                 }
         }
+        return 0;
 }
 
 int audit_send_list(void *_dest)
diff --git a/kernel/irq/resend.c b/kernel/irq/resend.c
index 35f10f7ff9..5bfeaed7e4 100644
--- a/kernel/irq/resend.c
+++ b/kernel/irq/resend.c
@@ -38,7 +38,7 @@ static void resend_irqs(unsigned long arg)
                 clear_bit(irq, irqs_resend);
                 desc = irq_desc + irq;
                 local_irq_disable();
-                desc->handle_irq(irq, desc, NULL);
+                desc->handle_irq(irq, desc);
                 local_irq_enable();
         }
 }