diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-12-12 22:03:53 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-12-12 22:03:53 -0500 |
| commit | 9da305eb089c94c535d1790fd2dec16f44c1689f (patch) | |
| tree | f37f07f148fd7a793233c7f15c0fa9f46212049d /drivers/acpi/pci_link.c | |
| parent | d96212ed87d032d2d830e265aae14038dc1f8ad8 (diff) | |
| parent | 14ee0a1414536d27bc29373bf23c106b8ef8ce0b (diff) | |
| download | op-kernel-dev-9da305eb089c94c535d1790fd2dec16f44c1689f.zip op-kernel-dev-9da305eb089c94c535d1790fd2dec16f44c1689f.tar.gz | |
Merge branch 'master'
Diffstat (limited to 'drivers/acpi/pci_link.c')
| -rw-r--r-- | drivers/acpi/pci_link.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/pci_link.c b/drivers/acpi/pci_link.c index 82292b7..78927c0 100644 --- 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); |
