---

yaml --- r: 15043 b: refs/heads/master c: a64882e h: refs/heads/master i: 15041: 3ef74cc 15039: 42303fc v: v3
git-mirror · Dec 12, 2005 · 2ae9370 · 2ae9370
1 parent 79ae21a
commit 2ae9370
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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);