[PATCH] powerpc: Add support for "linux,usable-memory" on memory nodes

[deliverable/linux.git] / arch / powerpc / mm / numa.c

diff --git a/arch/powerpc/mm/numa.c b/arch/powerpc/mm/numa.c
index 40c99deb691b4202b3be43bcd34d11f59da1d6c6..97e83f1d1bdb3f872e3f4d99c9b5abcf1e989ccc 100644 (file)
--- 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;