From: Jiri Kosina <jikos@jikos.cz>
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: v6.6-pxa1908~57113^2^2~3
X-Git-Url: https://git.dujemihanovic.xyz/?a=commitdiff_plain;h=168a328f30e9d1a8bc6ff55c0501e0bdc08bee60;p=linux.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 <jikos@jikos.cz>
Signed-off-by: Len Brown <len.brown@intel.com>
---

diff --git a/drivers/acpi/pci_link.c b/drivers/acpi/pci_link.c
index 7f3e7e77e794..d53bd9878ca2 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;