diff options
| author | Grant Likely <grant.likely@linaro.org> | 2015-06-30 13:28:52 (GMT) |
|---|---|---|
| committer | Grant Likely <grant.likely@linaro.org> | 2015-06-30 13:28:52 (GMT) |
| commit | becfc3c86df963491ff1d5ffc6131a06af6bb851 (patch) | |
| tree | 4b60fb962445166025724b84ce13e7f1762df8a1 /drivers/of/address.c | |
| parent | ce32f859646bab2ed724393398b90aa50149bb44 (diff) | |
| parent | 0b34c1a489f6f018c4fbfbd12657acaa0b4f4ca9 (diff) | |
| download | linux-becfc3c86df963491ff1d5ffc6131a06af6bb851.tar.xz | |
Merge remote-tracking branch 'robh/for-next' into devicetree/next
Diffstat (limited to 'drivers/of/address.c')
| -rw-r--r-- | drivers/of/address.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/of/address.c b/drivers/of/address.c index 78a7dcb..65c3289 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; |