git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Pull pnpacpi into acpica branch
[sfrench/cifs-2.6.git]
/
drivers
/
acpi
/
pci_link.c
diff --git
a/drivers/acpi/pci_link.c
b/drivers/acpi/pci_link.c
index 492170373494f89ad4ad11b825053886469e482d..1ffc771153679c2dbd247d124b2a2d9ef71a7723 100644
(file)
--- a/
drivers/acpi/pci_link.c
+++ b/
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);