Attachment 71593 Details for Bug 153062

[patch] Get rid of the slab debug errors

acpi_osl_atomics.patch (text/plain), 2.58 KB, created by Thomas Renninger on 2006-03-07 16:00:03 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Thomas Renninger

Created: 2006-03-07 16:00:03 UTC

Size: 2.58 KB

patch

obsolete

>From: Thomas Renninger <trenn@suse.de>
>Subject: No GFP_KERNEL buffer alloc or mutexes if in_intr or irqs_disabled
>Patch-mainline: not yet
>References: 153062
>
>Signed-off-by: Thomas Renninger <trenn@suse.de>
>
> drivers/acpi/osl.c               |   14 +++++++++-----
> drivers/acpi/utilities/utmutex.c |   15 ++++++++++++++-
> drivers/acpi/utils.c             |    7 ++++++-
> include/acpi/acexcep.h           |    3 ++-
> 4 files changed, 31 insertions(+), 8 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
>@@ -139,10 +139,9 @@ void acpi_os_vprintf(const char *fmt, va
> }
> 
> 
>-extern int acpi_in_resume;
> void *acpi_os_allocate(acpi_size size)
> {
>-	if (acpi_in_resume)
>+	if (in_atomic() || irqs_disabled() || in_interrupt())
> 		return kmalloc(size, GFP_ATOMIC);
> 	else
> 		return kmalloc(size, GFP_KERNEL);
>@@ -880,7 +879,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() || irqs_disabled() || in_interrupt())
> 		timeout = 0;
> 
> 	switch (timeout) {
>@@ -1009,7 +1008,7 @@ u8 acpi_os_writable(void *ptr, acpi_size
> 
> u32 acpi_os_get_thread_id(void)
> {
>-	if (!in_atomic())
>+	if (!in_atomic() && !irqs_disabled() && !in_interrupt())
> 		return current->pid;
> 
> 	return 0;
>@@ -1252,7 +1251,12 @@ acpi_status acpi_os_release_object(acpi_
> 
> void *acpi_os_acquire_object(acpi_cache_t * cache)
> {
>-	void *object = kmem_cache_alloc(cache, GFP_KERNEL);
>+	void *object;
>+
>+	if (in_atomic() || irqs_disabled() || in_interrupt())
>+		object = kmem_cache_alloc(cache, GFP_ATOMIC);
>+	else
>+		object = kmem_cache_alloc(cache, GFP_KERNEL);
> 	WARN_ON(!object);
> 	return object;
> }
>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
>@@ -27,6 +27,7 @@
> #include <linux/module.h>
> #include <linux/init.h>
> #include <linux/types.h>
>+#include <linux/interrupt.h>
> #include <acpi/acpi_bus.h>
> #include <acpi/acpi_drivers.h>
> 
>@@ -264,7 +265,11 @@ acpi_evaluate_integer(acpi_handle handle
> 	if (!data)
> 		return_ACPI_STATUS(AE_BAD_PARAMETER);
> 
>-	element = kmalloc(sizeof(union acpi_object), GFP_KERNEL);
>+	if (in_atomic() || irqs_disabled() || in_interrupt())
>+		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);
>

Actions: View | Diff

Attachments on bug 153062: 71593