Commit 168a328f authored Aug 24, 2006 by Jiri Kosina Committed by Len Brown Oct 14, 2006

ACPI: acpi_pci_link_set() can allocate with either GFP_ATOMIC or GFP_KERNEL



acpi_pci_link_set() allocates both with interrupts on
and with interrupts off (resume-time), so check interrupts
and decide on GFP_ATOMIC or GFP_KERNEL at run-time.

Signed-off-by: Jiri Kosina <jikos@jikos.cz>
Signed-off-by: Len Brown <len.brown@intel.com>

parent 786f18c6

drivers/acpi/pci_link.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -307,7 +307,7 @@ static int acpi_pci_link_set(struct acpi_pci_link *link, int irq)
	if (!link \|\| !irq)		if (!link \|\| !irq)
	return -EINVAL;		return -EINVAL;

	resource = kmalloc(sizeof(*resource) + 1, GFP_ATOMIC);		resource = kmalloc(sizeof(*resource) + 1, irqs_disabled() ? GFP_ATOMIC: GFP_KERNEL);
	if (!resource)		if (!resource)
	return -ENOMEM;		return -ENOMEM;