Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc

Conflicts:
	arch/sparc/mm/init_64.c

Conflict was simple non-overlapping additions.

Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 32 insertions, 0 deletions

diff --git a/arch/sparc/mm/init_64.c b/arch/sparc/mm/init_64.c
index 9f4f532e2627..cdc9f145e3c3 100644
--- a/arch/sparc/mm/init_64.c
+++ b/arch/sparc/mm/init_64.c
@@ -352,6 +352,10 @@ void update_mmu_cache(struct vm_area_struct *vma, unsigned long address, pte_t *
 
         mm = vma->vm_mm;
 
+        /* Don't insert a non-valid PTE into the TSB, we'll deadlock.  */
+        if (!pte_accessible(mm, pte))
+                return;
+
         spin_lock_irqsave(&mm->context.lock, flags);
 
 #if defined(CONFIG_HUGETLB_PAGE) || defined(CONFIG_TRANSPARENT_HUGEPAGE)
@@ -2620,6 +2624,10 @@ void update_mmu_cache_pmd(struct vm_area_struct *vma, unsigned long addr,
 
         pte = pmd_val(entry);
 
+        /* Don't insert a non-valid PMD into the TSB, we'll deadlock.  */
+        if (!(pte & _PAGE_VALID))
+                return;
+
         /* We are fabricating 8MB pages using 4MB real hw pages.  */
         pte |= (addr & (1UL << REAL_HPAGE_SHIFT));
 
@@ -2764,3 +2772,27 @@ static int __init report_memory(void)
         return 0;
 }
 device_initcall(report_memory);
+
+#ifdef CONFIG_SMP
+#define do_flush_tlb_kernel_range       smp_flush_tlb_kernel_range
+#else
+#define do_flush_tlb_kernel_range       __flush_tlb_kernel_range
+#endif
+
+void flush_tlb_kernel_range(unsigned long start, unsigned long end)
+{
+        if (start < HI_OBP_ADDRESS && end > LOW_OBP_ADDRESS) {
+                if (start < LOW_OBP_ADDRESS) {
+                        flush_tsb_kernel_range(start, LOW_OBP_ADDRESS);
+                        do_flush_tlb_kernel_range(start, LOW_OBP_ADDRESS);
+                }
+                if (end > HI_OBP_ADDRESS) {
+                        flush_tsb_kernel_range(end, HI_OBP_ADDRESS);
+                        do_flush_tlb_kernel_range(end, HI_OBP_ADDRESS);
+                }
+        } else {
+                flush_tsb_kernel_range(start, end);
+                do_flush_tlb_kernel_range(start, end);
+        }
+}
+>>>>>>> c78f77e20d2ba5d4d5e478e85a6fb42556893e2d