From 2ae9370163989d91bd2e1834b4c8437276b0ce77 Mon Sep 17 00:00:00 2001
From: Dave Jones <davej@redhat.com>
Date: Mon, 12 Dec 2005 00:37:40 -0800
Subject: [PATCH] --- yaml --- r: 15043 b: refs/heads/master c:
 a64882e795cc1d890e3359d0aa143af1cf67e8d4 h: refs/heads/master i:   15041:
 3ef74cce1651d6b28ad383f6d32f60c13a985587   15039:
 42303fc8d9abd0a082d937c36d0e2bf3b5c3a873 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 df81a2592d4b..e29d25949ad2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 66d43e98ea6ff291cd4e524386bfb99105feb180
+refs/heads/master: a64882e795cc1d890e3359d0aa143af1cf67e8d4
diff --git a/trunk/drivers/acpi/pci_link.c b/trunk/drivers/acpi/pci_link.c
index 82292b77e5c6..78927c0f1551 100644
--- a/trunk/drivers/acpi/pci_link.c
+++ b/trunk/drivers/acpi/pci_link.c
@@ -316,7 +316,7 @@ static int acpi_pci_link_set(struct acpi_pci_link *link, int irq)
 	if (!link || !irq)
 		return_VALUE(-EINVAL);
 
-	resource = kmalloc(sizeof(*resource) + 1, GFP_KERNEL);
+	resource = kmalloc(sizeof(*resource) + 1, GFP_ATOMIC);
 	if (!resource)
 		return_VALUE(-ENOMEM);