From 4d7191cd354e9691f21a9e04f7dacd8afbbecf48 Mon Sep 17 00:00:00 2001
From: Jiri Kosina <jikos@jikos.cz>
Date: Thu, 24 Aug 2006 00:36:19 -0400
Subject: [PATCH] --- yaml --- r: 39616 b: refs/heads/master c:
 168a328f30e9d1a8bc6ff55c0501e0bdc08bee60 h: refs/heads/master v: v3

---
 [refs]                        | 2 +-
 trunk/drivers/acpi/pci_link.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 6d7cdcd6cef1..a79164638e12 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 786f18c666d7202a86a8aa42a98783b115fe8739
+refs/heads/master: 168a328f30e9d1a8bc6ff55c0501e0bdc08bee60
diff --git a/trunk/drivers/acpi/pci_link.c b/trunk/drivers/acpi/pci_link.c
index 7f3e7e77e794..d53bd9878ca2 100644
--- a/trunk/drivers/acpi/pci_link.c
+++ b/trunk/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;