[PATCH] ... and then some more work_struct-induced breakage (ibmvscsi)

[linux-2.6-omap-h63xx.git] / drivers / acpi / utils.c

diff --git a/drivers/acpi/utils.c b/drivers/acpi/utils.c
index f48227f4c8c9183f03e224852af6fa2f1c14c129..d0d84c43a9d4c547591a6e43ffb8b8857dc90a63 100644 (file)
--- a/drivers/acpi/utils.c
+++ b/drivers/acpi/utils.c
@@ -262,7 +262,7 @@ acpi_evaluate_integer(acpi_handle handle,
        if (!data)
                return AE_BAD_PARAMETER;
 
-       element = kmalloc(sizeof(union acpi_object), GFP_KERNEL);
+       element = kmalloc(sizeof(union acpi_object), irqs_disabled() ? GFP_ATOMIC: GFP_KERNEL);
        if (!element)
                return AE_NO_MEMORY;