| Message ID | 1463060055-24158-2-git-send-email-bharata@linux.vnet.ibm.com (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
On Thu, May 12, 2016 at 07:04:14PM +0530, Bharata B Rao wrote: > Signed-off-by: Bharata B Rao <bharata@linux.vnet.ibm.com> Reviewed-by: David Gibson <david@gibson.dropbear.id.au> > --- > arch/powerpc/mm/numa.c | 20 ++++++++++---------- > 1 file changed, 10 insertions(+), 10 deletions(-) > > diff --git a/arch/powerpc/mm/numa.c b/arch/powerpc/mm/numa.c > index 669a15e..4a87ccb 100644 > --- a/arch/powerpc/mm/numa.c > +++ b/arch/powerpc/mm/numa.c > @@ -1163,18 +1163,18 @@ int hot_add_scn_to_nid(unsigned long scn_addr) > > static u64 hot_add_drconf_memory_max(void) > { > - struct device_node *memory = NULL; > - unsigned int drconf_cell_cnt = 0; > - u64 lmb_size = 0; > + struct device_node *memory = NULL; > + unsigned int drconf_cell_cnt = 0; > + u64 lmb_size = 0; > const __be32 *dm = NULL; > > - memory = of_find_node_by_path("/ibm,dynamic-reconfiguration-memory"); > - if (memory) { > - drconf_cell_cnt = of_get_drconf_memory(memory, &dm); > - lmb_size = of_get_lmb_size(memory); > - of_node_put(memory); > - } > - return lmb_size * drconf_cell_cnt; > + memory = of_find_node_by_path("/ibm,dynamic-reconfiguration-memory"); > + if (memory) { > + drconf_cell_cnt = of_get_drconf_memory(memory, &dm); > + lmb_size = of_get_lmb_size(memory); > + of_node_put(memory); > + } > + return lmb_size * drconf_cell_cnt; > } > > /*
On Thu, 2016-12-05 at 13:34:14 UTC, Bharata B Rao wrote: > Signed-off-by: Bharata B Rao <bharata@linux.vnet.ibm.com> > Reviewed-by: David Gibson <david@gibson.dropbear.id.au> Applied to powerpc next, thanks. https://git.kernel.org/powerpc/c/e70bd3ae914ec40d8505ed842d cheers
diff --git a/arch/powerpc/mm/numa.c b/arch/powerpc/mm/numa.c index 669a15e..4a87ccb 100644 --- a/arch/powerpc/mm/numa.c +++ b/arch/powerpc/mm/numa.c @@ -1163,18 +1163,18 @@ int hot_add_scn_to_nid(unsigned long scn_addr) static u64 hot_add_drconf_memory_max(void) { - struct device_node *memory = NULL; - unsigned int drconf_cell_cnt = 0; - u64 lmb_size = 0; + struct device_node *memory = NULL; + unsigned int drconf_cell_cnt = 0; + u64 lmb_size = 0; const __be32 *dm = NULL; - memory = of_find_node_by_path("/ibm,dynamic-reconfiguration-memory"); - if (memory) { - drconf_cell_cnt = of_get_drconf_memory(memory, &dm); - lmb_size = of_get_lmb_size(memory); - of_node_put(memory); - } - return lmb_size * drconf_cell_cnt; + memory = of_find_node_by_path("/ibm,dynamic-reconfiguration-memory"); + if (memory) { + drconf_cell_cnt = of_get_drconf_memory(memory, &dm); + lmb_size = of_get_lmb_size(memory); + of_node_put(memory); + } + return lmb_size * drconf_cell_cnt; } /*
Signed-off-by: Bharata B Rao <bharata@linux.vnet.ibm.com> --- arch/powerpc/mm/numa.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-)