2 files changed, 13 insertions, 3 deletions

diff --git a/arch/powerpc/kernel/prom.c b/arch/powerpc/kernel/prom.c
index fddc9c13bff5..7e798d5b03b4 100644
--- a/arch/powerpc/kernel/prom.c
+++ b/arch/powerpc/kernel/prom.c
@@ -567,7 +567,10 @@ static int __init interpret_root_props(struct device_node *np,
         unsigned int *rp;
         int rpsize = (naddrc + nsizec) * sizeof(unsigned int);
 
-        rp = (unsigned int *) get_property(np, "reg", &l);
+        rp = (unsigned int *) get_property(np, "linux,usable-memory", &l);
+        if (rp == NULL)
+                rp = (unsigned int *) get_property(np, "reg", &l);
+
         if (rp != 0 && l >= rpsize) {
                 i = 0;
                 adr = (struct address_range *) (*mem_start);
@@ -1275,7 +1278,9 @@ static int __init early_init_dt_scan_memory(unsigned long node,
         } else if (strcmp(type, "memory") != 0)
                 return 0;
 
-        reg = (cell_t *)of_get_flat_dt_prop(node, "reg", &l);
+        reg = (cell_t *)of_get_flat_dt_prop(node, "linux,usable-memory", &l);
+        if (reg == NULL)
+                reg = (cell_t *)of_get_flat_dt_prop(node, "reg", &l);
         if (reg == NULL)
                 return 0;
 
diff --git a/arch/powerpc/mm/numa.c b/arch/powerpc/mm/numa.c
index 40c99deb691b..97e83f1d1bdb 100644
--- a/arch/powerpc/mm/numa.c
+++ b/arch/powerpc/mm/numa.c
@@ -423,7 +423,12 @@ static int __init parse_numa_properties(void)
                 unsigned int *memcell_buf;
                 unsigned int len;
 
-                memcell_buf = (unsigned int *)get_property(memory, "reg", &len);
+                memcell_buf = (unsigned int *)get_property(memory,
+                        "linux,usable-memory", &len);
+                if (!memcell_buf || len <= 0)
+                        memcell_buf =
+                                (unsigned int *)get_property(memory, "reg",
+                                        &len);
                 if (!memcell_buf || len <= 0)
                         continue;