3 files changed, 7 insertions, 4 deletions

diff --git a/arch/ppc64/mm/hugetlbpage.c b/arch/ppc64/mm/hugetlbpage.c
index e7833c80eb68..338771ec70d7 100644
--- a/arch/ppc64/mm/hugetlbpage.c
+++ b/arch/ppc64/mm/hugetlbpage.c
@@ -144,7 +144,8 @@ static void flush_low_segments(void *parm)
         for (i = 0; i < NUM_LOW_AREAS; i++) {
                 if (! (areas & (1U << i)))
                         continue;
-                asm volatile("slbie %0" : : "r" (i << SID_SHIFT));
+                asm volatile("slbie %0"
+                             : : "r" ((i << SID_SHIFT) | SLBIE_C));
         }
 
         asm volatile("isync" : : : "memory");
@@ -164,7 +165,8 @@ static void flush_high_segments(void *parm)
                         continue;
                 for (j = 0; j < (1UL << (HTLB_AREA_SHIFT-SID_SHIFT)); j++)
                         asm volatile("slbie %0"
-                                     :: "r" ((i << HTLB_AREA_SHIFT) + (j << SID_SHIFT)));
+                                     :: "r" (((i << HTLB_AREA_SHIFT)
+                                             + (j << SID_SHIFT)) | SLBIE_C));
         }
 
         asm volatile("isync" : : : "memory");
diff --git a/arch/ppc64/mm/init.c b/arch/ppc64/mm/init.c
index b3b1e9c1770a..a14ab87df491 100644
--- a/arch/ppc64/mm/init.c
+++ b/arch/ppc64/mm/init.c
@@ -392,6 +392,7 @@ void free_initmem(void)
 
         addr = (unsigned long)__init_begin;
         for (; addr < (unsigned long)__init_end; addr += PAGE_SIZE) {
+                memset((void *)addr, 0xcc, PAGE_SIZE);
                 ClearPageReserved(virt_to_page(addr));
                 set_page_count(virt_to_page(addr), 1);
                 free_page(addr);
diff --git a/arch/ppc64/mm/slb.c b/arch/ppc64/mm/slb.c
index 244150a0bc18..0473953f6a37 100644
--- a/arch/ppc64/mm/slb.c
+++ b/arch/ppc64/mm/slb.c
@@ -87,8 +87,8 @@ void switch_slb(struct task_struct *tsk, struct mm_struct *mm)
                 int i;
                 asm volatile("isync" : : : "memory");
                 for (i = 0; i < offset; i++) {
-                        esid_data = (unsigned long)get_paca()->slb_cache[i]
-                                << SID_SHIFT;
+                        esid_data = ((unsigned long)get_paca()->slb_cache[i]
+                                << SID_SHIFT) | SLBIE_C;
                         asm volatile("slbie %0" : : "r" (esid_data));
                 }
                 asm volatile("isync" : : : "memory");