summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorPierre Ossman <drzeus@drzeus.cx>2005-12-12 00:37:22 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2005-12-12 08:57:43 -0800
commit7a4ae749a478f8bca73d4b5b8c1b8cbb178b2db5 (patch)
treea8480cc6ab547c01818182112ce4bc8bdcc6f91f /kernel
parentbf001b26793bd9f8a446577c361226fbcd617182 (diff)
downloadlinux-7a4ae749a478f8bca73d4b5b8c1b8cbb178b2db5.tar.gz
linux-7a4ae749a478f8bca73d4b5b8c1b8cbb178b2db5.tar.bz2
linux-7a4ae749a478f8bca73d4b5b8c1b8cbb178b2db5.zip
[PATCH] Add try_to_freeze to kauditd
kauditd was causing suspends to fail because it refused to freeze. Adding a try_to_freeze() to its sleep loop solves the issue. Signed-off-by: Pierre Ossman <drzeus@drzeus.cx> Acked-by: Pavel Machek <pavel@suse.cz> Cc: David Woodhouse <dwmw2@infradead.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/audit.c4
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);