[SPARC64]: Fix _PAGE_EXEC handling.

First of all, use the known _PAGE_EXEC_{4U,4V} value instead
of loading _PAGE_EXEC from memory.  We either know which one
to use by context, or we can code patch the test.

Next, we need to check executability of a PTE in the generic
TSB miss handler.

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

1 files changed, 1 insertions, 3 deletions

diff --git a/arch/sparc64/kernel/sun4v_tlb_miss.S b/arch/sparc64/kernel/sun4v_tlb_miss.S
index 3dccbd67818a..3eed8db96848 100644
--- a/arch/sparc64/kernel/sun4v_tlb_miss.S
+++ b/arch/sparc64/kernel/sun4v_tlb_miss.S
@@ -58,11 +58,9 @@ sun4v_itlb_miss:
         /* Load TSB tag/pte into %g2/%g3 and compare the tag.  */
         ldda    [%g1] ASI_QUAD_LDD_PHYS_4V, %g2
         cmp     %g2, %g6
-        sethi   %hi(PAGE_EXEC), %g7
-        ldx     [%g7 + %lo(PAGE_EXEC)], %g7
         bne,a,pn %xcc, tsb_miss_page_table_walk
          mov    FAULT_CODE_ITLB, %g3
-        andcc   %g3, %g7, %g0
+        andcc   %g3, _PAGE_EXEC_4V, %g0
         be,a,pn %xcc, tsb_do_fault
          mov    FAULT_CODE_ITLB, %g3