diff options
author | Jeff Garzik <jgarzik@pobox.com> | 2005-12-13 01:46:20 -0500 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2005-12-13 01:46:20 -0500 |
commit | 80c7af4074cbb4cb6be5d35c443ea6d5e8838a84 (patch) | |
tree | e900ad4c0beb4f44f0912b847c3319f11ef57d73 /kernel/audit.c | |
parent | 451ec6ab310602515b361418debe93d00f67e273 (diff) | |
parent | d00d598ffbba974d9045ba8b95296655fe2162c5 (diff) |
Merge branch 'upstream'
Diffstat (limited to 'kernel/audit.c')
-rw-r--r-- | kernel/audit.c | 4 |
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) | |||
291 | set_current_state(TASK_INTERRUPTIBLE); | 291 | set_current_state(TASK_INTERRUPTIBLE); |
292 | add_wait_queue(&kauditd_wait, &wait); | 292 | add_wait_queue(&kauditd_wait, &wait); |
293 | 293 | ||
294 | if (!skb_queue_len(&audit_skb_queue)) | 294 | if (!skb_queue_len(&audit_skb_queue)) { |
295 | try_to_freeze(); | ||
295 | schedule(); | 296 | schedule(); |
297 | } | ||
296 | 298 | ||
297 | __set_current_state(TASK_RUNNING); | 299 | __set_current_state(TASK_RUNNING); |
298 | remove_wait_queue(&kauditd_wait, &wait); | 300 | remove_wait_queue(&kauditd_wait, &wait); |