4 files changed, 24 insertions, 11 deletions

diff --git a/arch/powerpc/include/asm/machdep.h b/arch/powerpc/include/asm/machdep.h
index 5c38e49ddd42..fd22442d30a9 100644
--- a/arch/powerpc/include/asm/machdep.h
+++ b/arch/powerpc/include/asm/machdep.h
@@ -54,7 +54,7 @@ struct machdep_calls {
                                        int psize, int apsize,
                                        int ssize);
         long            (*hpte_remove)(unsigned long hpte_group);
-        void            (*hpte_removebolted)(unsigned long ea,
+        int             (*hpte_removebolted)(unsigned long ea,
                                              int psize, int ssize);
         void            (*flush_hash_range)(unsigned long number, int local);
         void            (*hugepage_invalidate)(unsigned long vsid,
diff --git a/arch/powerpc/mm/hash_utils_64.c b/arch/powerpc/mm/hash_utils_64.c
index 70490c41e14e..44f145a66578 100644
--- a/arch/powerpc/mm/hash_utils_64.c
+++ b/arch/powerpc/mm/hash_utils_64.c
@@ -269,6 +269,8 @@ int htab_remove_mapping(unsigned long vstart, unsigned long vend,
 {
         unsigned long vaddr;
         unsigned int step, shift;
+        int rc;
+        int ret = 0;
 
         shift = mmu_psize_defs[psize].shift;
         step = 1 << shift;
@@ -276,10 +278,17 @@ int htab_remove_mapping(unsigned long vstart, unsigned long vend,
         if (!ppc_md.hpte_removebolted)
                 return -ENODEV;
 
-        for (vaddr = vstart; vaddr < vend; vaddr += step)
-                ppc_md.hpte_removebolted(vaddr, psize, ssize);
+        for (vaddr = vstart; vaddr < vend; vaddr += step) {
+                rc = ppc_md.hpte_removebolted(vaddr, psize, ssize);
+                if (rc == -ENOENT) {
+                        ret = -ENOENT;
+                        continue;
+                }
+                if (rc < 0)
+                        return rc;
+        }
 
-        return 0;
+        return ret;
 }
 #endif /* CONFIG_MEMORY_HOTPLUG */
 
diff --git a/arch/powerpc/mm/init_64.c b/arch/powerpc/mm/init_64.c
index 379a6a90644b..baa1a23488d3 100644
--- a/arch/powerpc/mm/init_64.c
+++ b/arch/powerpc/mm/init_64.c
@@ -232,10 +232,11 @@ static void __meminit vmemmap_create_mapping(unsigned long start,
 static void vmemmap_remove_mapping(unsigned long start,
                                    unsigned long page_size)
 {
-        int mapped = htab_remove_mapping(start, start + page_size,
-                                         mmu_vmemmap_psize,
-                                         mmu_kernel_ssize);
-        BUG_ON(mapped < 0);
+        int rc = htab_remove_mapping(start, start + page_size,
+                                     mmu_vmemmap_psize,
+                                     mmu_kernel_ssize);
+        BUG_ON((rc < 0) && (rc != -ENOENT));
+        WARN_ON(rc == -ENOENT);
 }
 #endif
 
diff --git a/arch/powerpc/platforms/pseries/lpar.c b/arch/powerpc/platforms/pseries/lpar.c
index 477290ad855e..2415a0d31f8f 100644
--- a/arch/powerpc/platforms/pseries/lpar.c
+++ b/arch/powerpc/platforms/pseries/lpar.c
@@ -505,8 +505,8 @@ static void pSeries_lpar_hugepage_invalidate(unsigned long vsid,
 }
 #endif
 
-static void pSeries_lpar_hpte_removebolted(unsigned long ea,
-                                           int psize, int ssize)
+static int pSeries_lpar_hpte_removebolted(unsigned long ea,
+                                          int psize, int ssize)
 {
         unsigned long vpn;
         unsigned long slot, vsid;
@@ -515,11 +515,14 @@ static void pSeries_lpar_hpte_removebolted(unsigned long ea,
         vpn = hpt_vpn(ea, vsid, ssize);
 
         slot = pSeries_lpar_hpte_find(vpn, psize, ssize);
-        BUG_ON(slot == -1);
+        if (slot == -1)
+                return -ENOENT;
+
         /*
          * lpar doesn't use the passed actual page size
          */
         pSeries_lpar_hpte_invalidate(slot, vpn, psize, 0, ssize, 0);
+        return 0;
 }
 
 /*