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

Pull sparc update from David Miller:

 1) Implement support for up to 47-bit physical addresses on sparc64.

 2) Support HAVE_CONTEXT_TRACKING on sparc64, from Kirill Tkhai.

 3) Fix Simba bridge window calculations, from Kjetil Oftedal.

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next:
  sparc64: Implement HAVE_CONTEXT_TRACKING
  sparc64: Add self-IPI support for smp_send_reschedule()
  sparc: PCI: Fix incorrect address calculation of PCI Bridge windows on Simba-bridges
  sparc64: Encode huge PMDs using PTE encoding.
  sparc64: Move to 64-bit PGDs and PMDs.
  sparc64: Move from 4MB to 8MB huge pages.
  sparc64: Make PAGE_OFFSET variable.
  sparc64: Fix inconsistent max-physical-address defines.
  sparc64: Document the shift counts used to validate linear kernel addresses.
  sparc64: Define PAGE_OFFSET in terms of physical address bits.
  sparc64: Use PAGE_OFFSET instead of a magic constant.
  sparc64: Clean up 64-bit mmap exclusion defines.

1 files changed, 8 insertions, 5 deletions

diff --git a/arch/sparc/mm/tlb.c b/arch/sparc/mm/tlb.c
index 656cc46a81f5..ad3bf4b4324d 100644
--- a/arch/sparc/mm/tlb.c
+++ b/arch/sparc/mm/tlb.c
@@ -161,8 +161,8 @@ void set_pmd_at(struct mm_struct *mm, unsigned long addr,
         if (mm == &init_mm)
                 return;
 
-        if ((pmd_val(pmd) ^ pmd_val(orig)) & PMD_ISHUGE) {
-                if (pmd_val(pmd) & PMD_ISHUGE)
+        if ((pmd_val(pmd) ^ pmd_val(orig)) & _PAGE_PMD_HUGE) {
+                if (pmd_val(pmd) & _PAGE_PMD_HUGE)
                         mm->context.huge_pte_count++;
                 else
                         mm->context.huge_pte_count--;
@@ -178,13 +178,16 @@ void set_pmd_at(struct mm_struct *mm, unsigned long addr,
         }
 
         if (!pmd_none(orig)) {
-                bool exec = ((pmd_val(orig) & PMD_HUGE_EXEC) != 0);
+                pte_t orig_pte = __pte(pmd_val(orig));
+                bool exec = pte_exec(orig_pte);
 
                 addr &= HPAGE_MASK;
-                if (pmd_val(orig) & PMD_ISHUGE)
+                if (pmd_trans_huge(orig)) {
                         tlb_batch_add_one(mm, addr, exec);
-                else
+                        tlb_batch_add_one(mm, addr + REAL_HPAGE_SIZE, exec);
+                } else {
                         tlb_batch_pmd_scan(mm, addr, orig, exec);
+                }
         }
 }