Merge by hand from Linus' tree.

Signed-off-by: Paul Mackerras <paulus@samba.org>

3 files changed, 7 insertions, 5 deletions

diff --git a/arch/ppc64/kernel/machine_kexec.c b/arch/ppc64/kernel/machine_kexec.c
index 4775f12a013c..bf7cc4f8210f 100644
--- a/arch/ppc64/kernel/machine_kexec.c
+++ b/arch/ppc64/kernel/machine_kexec.c
@@ -205,6 +205,7 @@ static void kexec_prepare_cpus(void)
                         continue;
 
                 while (paca[i].hw_cpu_id != -1) {
+                        barrier();
                         if (!cpu_possible(i)) {
                                 printk("kexec: cpu %d hw_cpu_id %d is not"
                                                 " possible, ignoring\n",
diff --git a/arch/ppc64/mm/hash_native.c b/arch/ppc64/mm/hash_native.c
index 874cf96938ff..174d14576c28 100644
--- a/arch/ppc64/mm/hash_native.c
+++ b/arch/ppc64/mm/hash_native.c
@@ -342,14 +342,13 @@ static void native_flush_hash_range(unsigned long number, int local)
         hpte_t *hptep;
         unsigned long hpte_v;
         struct ppc64_tlb_batch *batch = &__get_cpu_var(ppc64_tlb_batch);
-        unsigned long large;
+        unsigned long large = batch->large;
 
         local_irq_save(flags);
 
         j = 0;
         for (i = 0; i < number; i++) {
                 va = batch->vaddr[j];
-                large = pte_huge(batch->pte[i]);
                 if (large)
                         vpn = va >> HPAGE_SHIFT;
                 else
@@ -399,7 +398,7 @@ static void native_flush_hash_range(unsigned long number, int local)
                 asm volatile("ptesync":::"memory");
 
                 for (i = 0; i < j; i++)
-                        __tlbie(batch->vaddr[i], 0);
+                        __tlbie(batch->vaddr[i], large);
 
                 asm volatile("eieio; tlbsync; ptesync":::"memory");
 
diff --git a/arch/ppc64/mm/tlb.c b/arch/ppc64/mm/tlb.c
index 31afd95bf870..09ab81a10f4f 100644
--- a/arch/ppc64/mm/tlb.c
+++ b/arch/ppc64/mm/tlb.c
@@ -141,12 +141,14 @@ void hpte_update(struct mm_struct *mm, unsigned long addr,
          * up scanning and resetting referenced bits then our batch context
          * will change mid stream.
          */
-        if (unlikely(i != 0 && mm != batch->mm)) {
+        if (i != 0 && (mm != batch->mm || batch->large != pte_huge(pte))) {
                 flush_tlb_pending();
                 i = 0;
         }
-        if (i == 0)
+        if (i == 0) {
                 batch->mm = mm;
+                batch->large = pte_huge(pte);
+        }
         if (addr < KERNELBASE) {
                 vsid = get_vsid(mm->context.id, addr);
                 WARN_ON(vsid == 0);