From: Jiri Kosina Date: Thu, 24 Aug 2006 04:36:19 +0000 (-0400) Subject: ACPI: acpi_pci_link_set() can allocate with either GFP_ATOMIC or GFP_KERNEL X-Git-Tag: v2.6.20-rc1~179^2^2~3 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=168a328f30e9d1a8bc6ff55c0501e0bdc08bee60;p=linux-2.6-omap-h63xx.git ACPI: acpi_pci_link_set() can allocate with either GFP_ATOMIC or GFP_KERNEL acpi_pci_link_set() allocates both with interrupts on and with interrupts off (resume-time), so check interrupts and decide on GFP_ATOMIC or GFP_KERNEL at run-time. Signed-off-by: Jiri Kosina Signed-off-by: Len Brown --- diff --git a/drivers/acpi/pci_link.c b/drivers/acpi/pci_link.c index 7f3e7e77e79..d53bd9878ca 100644 --- a/drivers/acpi/pci_link.c +++ b/drivers/acpi/pci_link.c @@ -307,7 +307,7 @@ static int acpi_pci_link_set(struct acpi_pci_link *link, int irq) if (!link || !irq) return -EINVAL; - resource = kmalloc(sizeof(*resource) + 1, GFP_ATOMIC); + resource = kmalloc(sizeof(*resource) + 1, irqs_disabled() ? GFP_ATOMIC: GFP_KERNEL); if (!resource) return -ENOMEM;