Merge with http://kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git

1 files changed, 3 insertions, 1 deletions

diff --git a/kernel/audit.c b/kernel/audit.c
index 0c56320d38dc..32fa03ad1984 100644
--- a/kernel/audit.c
+++ b/kernel/audit.c
@@ -291,8 +291,10 @@ int kauditd_thread(void *dummy)
                         set_current_state(TASK_INTERRUPTIBLE);
                         add_wait_queue(&kauditd_wait, &wait);
 
-                        if (!skb_queue_len(&audit_skb_queue))
+                        if (!skb_queue_len(&audit_skb_queue)) {
+                                try_to_freeze();
                                 schedule();
+                        }
 
                         __set_current_state(TASK_RUNNING);
                         remove_wait_queue(&kauditd_wait, &wait);