aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc/mm
diff options
context:
space:
mode:
Diffstat (limited to 'arch/powerpc/mm')
-rw-r--r--arch/powerpc/mm/numa.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/arch/powerpc/mm/numa.c b/arch/powerpc/mm/numa.c
index 00cc090cd1dc..0bfb90c50571 100644
--- a/arch/powerpc/mm/numa.c
+++ b/arch/powerpc/mm/numa.c
@@ -709,7 +709,6 @@ static void __init parse_drconf_memory(struct device_node *memory)
709 709
710static int __init parse_numa_properties(void) 710static int __init parse_numa_properties(void)
711{ 711{
712 struct device_node *cpu = NULL;
713 struct device_node *memory; 712 struct device_node *memory;
714 int default_nid = 0; 713 int default_nid = 0;
715 unsigned long i; 714 unsigned long i;
@@ -732,6 +731,7 @@ static int __init parse_numa_properties(void)
732 * each node to be onlined must have NODE_DATA etc backing it. 731 * each node to be onlined must have NODE_DATA etc backing it.
733 */ 732 */
734 for_each_present_cpu(i) { 733 for_each_present_cpu(i) {
734 struct device_node *cpu;
735 int nid; 735 int nid;
736 736
737 cpu = of_get_cpu_node(i, NULL); 737 cpu = of_get_cpu_node(i, NULL);
@@ -800,8 +800,9 @@ new_range:
800 } 800 }
801 801
802 /* 802 /*
803 * Now do the same thing for each MEMBLOCK listed in the ibm,dynamic-memory 803 * Now do the same thing for each MEMBLOCK listed in the
804 * property in the ibm,dynamic-reconfiguration-memory node. 804 * ibm,dynamic-memory property in the
805 * ibm,dynamic-reconfiguration-memory node.
805 */ 806 */
806 memory = of_find_node_by_path("/ibm,dynamic-reconfiguration-memory"); 807 memory = of_find_node_by_path("/ibm,dynamic-reconfiguration-memory");
807 if (memory) 808 if (memory)