diff options
author | Steve French <sfrench@us.ibm.com> | 2005-12-13 13:15:39 -0500 |
---|---|---|
committer | Steve French <sfrench@us.ibm.com> | 2005-12-13 13:15:39 -0500 |
commit | da8543ef125afc7bba4da526b61a1ae07dc25109 (patch) | |
tree | 6aec5867f8e054c22c6208032280ed1434c14a58 /kernel/audit.c | |
parent | ec637e3ffb6b978143652477c7c5f96c9519b691 (diff) | |
parent | 90ac8f7741be4ff66de1f52904f4f67f272f74ce (diff) |
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Signed-off-by: Steve French <sfrench@us.ibm.com>
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); |