2 files changed, 5 insertions, 2 deletions

diff --git a/arch/ppc64/Kconfig b/arch/ppc64/Kconfig
index 3c8bfd0345cc..c92d48fe06e5 100644
--- a/arch/ppc64/Kconfig
+++ b/arch/ppc64/Kconfig
@@ -212,8 +212,8 @@ config ARCH_FLATMEM_ENABLE
 source "mm/Kconfig"
 
 config HAVE_ARCH_EARLY_PFN_TO_NID
-        bool
-        default y
+        def_bool y
+        depends on NEED_MULTIPLE_NODES
 
 # Some NUMA nodes have memory ranges that span
 # other nodes.  Even though a pfn is valid and
diff --git a/arch/ppc64/mm/numa.c b/arch/ppc64/mm/numa.c
index ea862ec643d3..cafd91aef289 100644
--- a/arch/ppc64/mm/numa.c
+++ b/arch/ppc64/mm/numa.c
@@ -440,6 +440,8 @@ new_range:
                 for (i = start ; i < (start+size); i += MEMORY_INCREMENT)
                         numa_memory_lookup_table[i >> MEMORY_INCREMENT_SHIFT] =
                                 numa_domain;
+                memory_present(numa_domain, start >> PAGE_SHIFT,
+                                                (start + size) >> PAGE_SHIFT);
 
                 if (--ranges)
                         goto new_range;
@@ -481,6 +483,7 @@ static void __init setup_nonnuma(void)
 
         for (i = 0 ; i < top_of_ram; i += MEMORY_INCREMENT)
                 numa_memory_lookup_table[i >> MEMORY_INCREMENT_SHIFT] = 0;
+        memory_present(0, 0, init_node_data[0].node_end_pfn);
 }
 
 static void __init dump_numa_topology(void)