From: Jingoo Han <jingoohan1@gmail.com>
Date: Wed, 17 Jun 2015 15:12:27 +0000 (+0900)
Subject: of/address: use atomic allocation in pci_register_io_range()
X-Git-Tag: v4.1.4~37
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=a35b0d6cc0ec26fb607f6cf7bc7be5756c5de63e;p=users%2Fjedix%2Flinux-maple.git

of/address: use atomic allocation in pci_register_io_range()

commit 294240ffe784e951dc2ef070da04fa31ef6db3a0 upstream.

When kzalloc() is called under spin_lock(), GFP_ATOMIC should be
used to avoid sleeping allocation.
The call tree is:
  of_pci_range_to_resource()
    --> pci_register_io_range() <-- takes spin_lock(&io_range_lock);
       --> kzalloc()

Signed-off-by: Jingoo Han <jingoohan1@gmail.com>
Signed-off-by: Rob Herring <robh@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/drivers/of/address.c b/drivers/of/address.c
index 6906a3f61bd86..8bfda6ade2c02 100644
--- a/drivers/of/address.c
+++ b/drivers/of/address.c
@@ -712,7 +712,7 @@ int __weak pci_register_io_range(phys_addr_t addr, resource_size_t size)
 	}
 
 	/* add the range to the list */
-	range = kzalloc(sizeof(*range), GFP_KERNEL);
+	range = kzalloc(sizeof(*range), GFP_ATOMIC);
 	if (!range) {
 		err = -ENOMEM;
 		goto end_register;