From: Jiri Kosina <jikos@xxxxxxxx> acpi_pci_link_set() allocates with GFP_ATOMIC. On resume from suspend, this is called with interrupts off, otherwise GFP_KERNEL is safe. On the other hand, when resuming from suspend with interrupts off, the following callchain allocates with GFP_KERNEL, which is wrong: acpi_pci_link_resume -> acpi_pci_link_set -> acpi_set_current_resources -> acpi_rs_set_srs_method_data -> acpi_ut_create_internal_object_dbg -> acpi_ut_allocate_object_desc_dbg -> acpi_os_acquire_object -> kmem_cache_alloc(GFP_KERNEL) flag. Signed-off-by: Jiri Kosina <jikos@xxxxxxxx> Cc: "Brown, Len" <len.brown@xxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxx> --- drivers/acpi/pci_link.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff -puN drivers/acpi/pci_link.c~acpi-change-gfp_atomic-to-gfp_kernel-for-non-atomic drivers/acpi/pci_link.c --- a/drivers/acpi/pci_link.c~acpi-change-gfp_atomic-to-gfp_kernel-for-non-atomic +++ a/drivers/acpi/pci_link.c @@ -307,7 +307,12 @@ static int acpi_pci_link_set(struct acpi if (!link || !irq) return -EINVAL; - resource = kmalloc(sizeof(*resource) + 1, GFP_ATOMIC); + /* irqs could be disabled when resuming from suspend */ + if (irqs_disabled()) + resource = kmalloc(sizeof(*resource) + 1, GFP_ATOMIC); + else + resource = kmalloc(sizeof(*resource) + 1, GFP_KERNEL); + if (!resource) return -ENOMEM; _ - To unsubscribe from this list: send the line "unsubscribe linux-acpi" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
