projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'metag-for-v4.4' of git://git.kernel.org/pub/scm/linux/kernel/git/jhogan...
[firefly-linux-kernel-4.4.55.git]
/
arch
/
powerpc
/
mm
/
numa.c
diff --git
a/arch/powerpc/mm/numa.c
b/arch/powerpc/mm/numa.c
index 8b9502adaf794f021c77a666e79d6df8f2d8d0a9..669a15e7fa76a07ad57c3d2b82712766520a049a 100644
(file)
--- a/
arch/powerpc/mm/numa.c
+++ b/
arch/powerpc/mm/numa.c
@@
-80,7
+80,7
@@
static void __init setup_node_to_cpumask_map(void)
setup_nr_node_ids();
/* allocate the map */
setup_nr_node_ids();
/* allocate the map */
- for
(node = 0; node < nr_node_ids; node++
)
+ for
_each_node(node
)
alloc_bootmem_cpumask_var(&node_to_cpumask_map[node]);
/* cpumask_of_node() will now work */
alloc_bootmem_cpumask_var(&node_to_cpumask_map[node]);
/* cpumask_of_node() will now work */
@@
-276,7
+276,6
@@
static int of_node_to_nid_single(struct device_node *device)
/* Walk the device tree upwards, looking for an associativity id */
int of_node_to_nid(struct device_node *device)
{
/* Walk the device tree upwards, looking for an associativity id */
int of_node_to_nid(struct device_node *device)
{
- struct device_node *tmp;
int nid = -1;
of_node_get(device);
int nid = -1;
of_node_get(device);
@@
-285,9
+284,7
@@
int of_node_to_nid(struct device_node *device)
if (nid != -1)
break;
if (nid != -1)
break;
- tmp = device;
- device = of_get_parent(tmp);
- of_node_put(tmp);
+ device = of_get_next_parent(device);
}
of_node_put(device);
}
of_node_put(device);