rpms/kernel/devel linux-2.6-suspend-slab-warnings.patch, NONE, 1.1 kernel-2.6.spec, 1.2035, 1.2036

[fedora-cvs-commits at redhat.com]

Author: davej

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

Modified Files:
	kernel-2.6.spec 
Added Files:
	linux-2.6-suspend-slab-warnings.patch 
Log Message:
Fix up some debug spew that could occur during resume.


linux-2.6-suspend-slab-warnings.patch:
 osl.c   |    4 ++--
 utils.c |    6 +++++-
 2 files changed, 7 insertions(+), 3 deletions(-)

--- NEW FILE linux-2.6-suspend-slab-warnings.patch ---

When going into suspend irqs must be disabled for a long time.

There is already a acpi_in_resume variable in osl.c
to not make use of sleeping functions (mem allocs/mutexes).
This one just makes a bit more intensive use of it.

The acpi_in_resume seem to vanish later (pci_link.c):
/*
 * FIXME: this is a workaround to avoid nasty warning.  It will be removed
 * after every device calls pci_disable_device in .resume.
 */
but for now below patch seem to be needed:

Subject: No GFP_KERNEL buffer alloc or mutexes if resuming

Signed-off-by: Thomas Renninger <trenn at suse.de>

 drivers/acpi/osl.c   |   10 +++++++---
 drivers/acpi/utils.c |    6 +++++-
 2 files changed, 12 insertions(+), 4 deletions(-)

Index: linux-2.6.15/drivers/acpi/osl.c
===================================================================
--- linux-2.6.15.orig/drivers/acpi/osl.c
+++ linux-2.6.15/drivers/acpi/osl.c
@@ -880,7 +880,7 @@ acpi_status acpi_os_wait_semaphore(acpi_
 	ACPI_DEBUG_PRINT((ACPI_DB_MUTEX, "Waiting for semaphore[%p|%d|%d]\n",
 			  handle, units, timeout));
 
-	if (in_atomic())
+	if (in_atomic() || acpi_in_resume)
 		timeout = 0;
 
 	switch (timeout) {
@@ -1009,7 +1009,7 @@ u8 acpi_os_writable(void *ptr, acpi_size
 
 u32 acpi_os_get_thread_id(void)
 {
-	if (!in_atomic())
+	if (!in_atomic() && !acpi_in_resume)
 		return current->pid;
 
 	return 0;
Index: linux-2.6.15/drivers/acpi/utils.c
===================================================================
--- linux-2.6.15.orig/drivers/acpi/utils.c
+++ linux-2.6.15/drivers/acpi/utils.c
@@ -250,6 +250,7 @@ acpi_extract_package(union acpi_object *
 
 EXPORT_SYMBOL(acpi_extract_package);
 
+extern int acpi_in_resume;
 acpi_status
 acpi_evaluate_integer(acpi_handle handle,
 		      acpi_string pathname,
@@ -264,7 +265,10 @@ acpi_evaluate_integer(acpi_handle handle
 	if (!data)
 		return_ACPI_STATUS(AE_BAD_PARAMETER);
 
-	element = kmalloc(sizeof(union acpi_object), GFP_KERNEL);
+	if (acpi_in_resume)
+		element = kmalloc(sizeof(union acpi_object), GFP_ATOMIC);
+	else
+		element = kmalloc(sizeof(union acpi_object), GFP_KERNEL);
 	if (!element)
 		return_ACPI_STATUS(AE_NO_MEMORY);
 



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2035
retrieving revision 1.2036
diff -u -r1.2035 -r1.2036
--- kernel-2.6.spec	9 Mar 2006 19:27:39 -0000	1.2035
+++ kernel-2.6.spec	9 Mar 2006 19:37:07 -0000	1.2036
@@ -371,6 +371,7 @@
 Patch1730: linux-2.6-signal-trampolines-unwind-info.patch
 Patch1740: linux-2.6-softlockup-disable.patch
 Patch1750: linux-2.6-drm-cripple-r300.patch
+Patch1760: linux-2.6-suspend-slab-warnings.patch
 
 # SELinux/audit patches.
 Patch1800: linux-2.6-selinux-hush.patch
@@ -998,6 +999,8 @@
 %patch1740 -p1
 # Disable R300 and above DRI as it's unstable.
 %patch1750 -p1
+# Fix up kmalloc whilst atomic warning during resume.
+%patch1760 -p1
 
 # Silence some selinux messages.
 %patch1800 -p1
@@ -1653,6 +1656,7 @@
 - 2.6.16rc5-git12/git13
 - Make 'quiet' work again.
 - Turn off some debugging stuff.
+- Fix up some debug spew that could occur during resume.
 
 * Wed Mar  8 2006 Dave Jones <davej at redhat.com>
 - 2.6.16rc5-git10/git11