diff options
| author | Len Brown <len.brown@intel.com> | 2006-01-07 09:50:18 +0100 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2006-01-07 09:50:18 +0100 |
| commit | ed03f430cdc8c802652467e9097606fedc2c7abc (patch) | |
| tree | 30941ec1e6f93e99358fefe18175e5dd800a4379 /drivers/acpi/pci_link.c | |
| parent | [ACPI] fix pnpacpi regression resulting from ACPICA 20051117 (diff) | |
| parent | [ACPI] enable PNPACPI support for resource types used by HP serial ports (diff) | |
| download | linux-ed03f430cdc8c802652467e9097606fedc2c7abc.tar.xz linux-ed03f430cdc8c802652467e9097606fedc2c7abc.zip | |
Pull pnpacpi into acpica branch
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 492170373494..1ffc77115367 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); |