summaryrefslogtreecommitdiffstats
path: root/kernel/drivers/of
diff options
context:
space:
mode:
Diffstat (limited to 'kernel/drivers/of')
-rw-r--r--kernel/drivers/of/address.c2
-rw-r--r--kernel/drivers/of/base.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/kernel/drivers/of/address.c b/kernel/drivers/of/address.c
index 6906a3f61..8bfda6ade 100644
--- a/kernel/drivers/of/address.c
+++ b/kernel/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;
diff --git a/kernel/drivers/of/base.c b/kernel/drivers/of/base.c
index f0650265f..5ed97246c 100644
--- a/kernel/drivers/of/base.c
+++ b/kernel/drivers/of/base.c
@@ -89,7 +89,7 @@ EXPORT_SYMBOL(of_n_size_cells);
#ifdef CONFIG_NUMA
int __weak of_node_to_nid(struct device_node *np)
{
- return numa_node_id();
+ return NUMA_NO_NODE;
}
#endif