1 files changed, 7 insertions, 1 deletions

diff --git a/arch/powerpc/mm/mem.c b/arch/powerpc/mm/mem.c
index c781bbcf7338..5db316cad47b 100644
--- a/arch/powerpc/mm/mem.c
+++ b/arch/powerpc/mm/mem.c
@@ -123,7 +123,8 @@ int arch_add_memory(int nid, u64 start, u64 size)
         pgdata = NODE_DATA(nid);
 
         start = (unsigned long)__va(start);
-        create_section_mapping(start, start + size);
+        if (create_section_mapping(start, start + size))
+                return -EINVAL;
 
         /* this should work for most non-highmem platforms */
         zone = pgdata->node_zones;
@@ -548,4 +549,9 @@ void update_mmu_cache(struct vm_area_struct *vma, unsigned long address,
                 return;
         hash_preload(vma->vm_mm, address, access, trap);
 #endif /* CONFIG_PPC_STD_MMU */
+#if (defined(CONFIG_PPC_BOOK3E_64) || defined(CONFIG_PPC_FSL_BOOK3E)) \
+        && defined(CONFIG_HUGETLB_PAGE)
+        if (is_vm_hugetlb_page(vma))
+                book3e_hugetlb_preload(vma->vm_mm, address, *ptep);
+#endif
 }