diff options
| author | Len Brown <len.brown@intel.com> | 2005-12-14 08:59:50 +0100 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2005-12-14 08:59:50 +0100 |
| commit | d3e4cefc86ce1aefc0e9aebdc56308cb4bd51997 (patch) | |
| tree | f4418610996064cab63600ca093de65356dcdfde /drivers/acpi | |
| parent | Pull 5165 into release branch (diff) | |
| parent | Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/tg3-2.6 (diff) | |
| download | linux-d3e4cefc86ce1aefc0e9aebdc56308cb4bd51997.tar.xz linux-d3e4cefc86ce1aefc0e9aebdc56308cb4bd51997.zip | |
Auto-update from upstream
Diffstat (limited to 'drivers/acpi')
| -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 82292b77e5c6..78927c0f1551 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); |