[SPARC64]: Elminate all usage of hard-coded trap globals.

[firefly-linux-kernel-4.4.55.git] / arch / sparc64 / kernel / ttable.S

diff --git a/arch/sparc64/kernel/ttable.S b/arch/sparc64/kernel/ttable.S
index 8365bc1f81f3105f969ad938c3b3de3cebf221e7..2fb7a33993c0d57299327756f14fbc076b498362 100644 (file)
--- a/arch/sparc64/kernel/ttable.S
+++ b/arch/sparc64/kernel/ttable.S
@@ -78,9 +78,9 @@ tl0_vaw:      TRAP(do_vaw)
 tl0_cee:       membar #Sync
                TRAP_NOSAVE_7INSNS(__spitfire_cee_trap)
 tl0_iamiss:
-#include       "itlb_base.S"
+#include       "itlb_miss.S"
 tl0_damiss:
-#include       "dtlb_base.S"
+#include       "dtlb_miss.S"
 tl0_daprot:
 #include       "dtlb_prot.S"
 tl0_fecc:      BTRAP(0x70)     /* Fast-ECC on Cheetah */
@@ -128,7 +128,7 @@ tl0_flushw: FLUSH_WINDOW_TRAP
 tl0_resv104:   BTRAP(0x104) BTRAP(0x105) BTRAP(0x106) BTRAP(0x107)
                .globl tl0_solaris
 tl0_solaris:   SOLARIS_SYSCALL_TRAP
-tl0_netbsd:    NETBSD_SYSCALL_TRAP
+tl0_resv109:   BTRAP(0x109)
 tl0_resv10a:   BTRAP(0x10a) BTRAP(0x10b) BTRAP(0x10c) BTRAP(0x10d) BTRAP(0x10e)
 tl0_resv10f:   BTRAP(0x10f)
 tl0_linux32:   LINUX_32BIT_SYSCALL_TRAP
@@ -241,7 +241,7 @@ tl1_cee:    membar  #Sync
 
 tl1_iamiss:    BTRAPTL1(0x64) BTRAPTL1(0x65) BTRAPTL1(0x66) BTRAPTL1(0x67)
 tl1_damiss:
-#include       "dtlb_backend.S"
+#include       "dtlb_miss.S"
 tl1_daprot:
 #include       "dtlb_prot.S"
 tl1_fecc:      BTRAPTL1(0x70)  /* Fast-ECC on Cheetah */