rpms/kernel/FC-4 linux-2.6-kauditd-suspend.patch, NONE, 1.1 kernel-2.6.spec, 1.1486, 1.1487

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Sat Nov 5 04:47:10 UTC 2005


Author: davej

Update of /cvs/dist/rpms/kernel/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv5896

Modified Files:
	kernel-2.6.spec 
Added Files:
	linux-2.6-kauditd-suspend.patch 
Log Message:
fix suspend.


linux-2.6-kauditd-suspend.patch:
 audit.c |    4 ++++
 1 files changed, 4 insertions(+)

--- NEW FILE linux-2.6-kauditd-suspend.patch ---
--- linux-2.6.14/kernel/audit.c.orig	2005-11-02 08:45:20.000000000 +0000
+++ linux-2.6.14/kernel/audit.c	2005-11-02 08:44:41.000000000 +0000
@@ -288,6 +288,10 @@ int kauditd_thread(void *dummy)
 			}
 		} else {
 			DECLARE_WAITQUEUE(wait, current);
+
+			if (try_to_freeze())
+				continue;
+
 			set_current_state(TASK_INTERRUPTIBLE);
 			add_wait_queue(&kauditd_wait, &wait);
 


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/kernel-2.6.spec,v
retrieving revision 1.1486
retrieving revision 1.1487
diff -u -r1.1486 -r1.1487
--- kernel-2.6.spec	4 Nov 2005 07:22:58 -0000	1.1486
+++ kernel-2.6.spec	5 Nov 2005 04:47:06 -0000	1.1487
@@ -335,6 +335,7 @@
 Patch1757: linux-2.6-w1-hush-debug.patch
 Patch1758: linux-2.6-pwc-powerup-by-default.patch
 Patch1759: linux-2.6-net-zero-len-packet-rx.patch
+Patch1760: linux-2.6-kauditd-suspend.patch
 
 # ACPI patches.
 Patch1800: linux-2.6-acpi-enable-ecburst.patch
@@ -759,6 +760,8 @@
 %patch1758 -p1
 # Fix zero-length packet reception
 %patch1759 -p1
+# stop kauditd from breaking suspend.
+%patch1760 -p1
 
 # ACPI patches.
 # Enable EC burst
@@ -1214,6 +1217,9 @@
 %endif
 
 %changelog
+* Fri Nov  4 2005 Dave Jones <davej at redhat.com>
+- Stop kauditd from preventing suspend.
+
 * Thu Nov  3 2005 Dave Jones <davej at redhat.com> [2.6.14-1.1634_FC4]
 - Fix zero-length packet reception, which broke bind.
 




More information about the fedora-cvs-commits mailing list