Index: kernel/arch/sparc64/src/mm/sun4u/tlb.c
===================================================================
--- kernel/arch/sparc64/src/mm/sun4u/tlb.c	(revision 7852625a9a2570fb916023a5d354900c1c23d3ed)
+++ kernel/arch/sparc64/src/mm/sun4u/tlb.c	(revision 894d9ea4ebb3dc44d6c4351bbf2dd01289949937)
@@ -58,10 +58,4 @@
 static void dtlb_pte_copy(pte_t *, size_t, bool);
 static void itlb_pte_copy(pte_t *, size_t);
-static void do_fast_instruction_access_mmu_miss_fault(istate_t *, uintptr_t,
-    const char *);
-static void do_fast_data_access_mmu_miss_fault(istate_t *, tlb_tag_access_reg_t,
-    const char *);
-static void do_fast_data_access_protection_fault(istate_t *,
-    tlb_tag_access_reg_t, const char *);
 
 const char *context_encoding[] = {
@@ -222,9 +216,5 @@
 		 * handler.
 		 */
-		if (as_page_fault(page_16k, PF_ACCESS_EXEC, istate) ==
-		    AS_PF_FAULT) {
-			do_fast_instruction_access_mmu_miss_fault(istate,
-			    istate->tpc, __func__);
-		}
+		as_page_fault(page_16k, PF_ACCESS_EXEC, istate);
 	}
 }
@@ -256,12 +246,10 @@
 		if (!tag.vpn) {
 			/* NULL access in kernel */
-			do_fast_data_access_mmu_miss_fault(istate, tag,
-			    "Dereferencing NULL pointer.");
+			panic("NULL pointer dereference.");
 		} else if (page_8k >= end_of_identity) {
 			/* Kernel non-identity. */
 			as = AS_KERNEL;
 		} else {
-			do_fast_data_access_mmu_miss_fault(istate, tag,
-		    "Unexpected kernel page fault.");
+			panic("Unexpected kernel page fault.");
 		}
 	}
@@ -283,9 +271,5 @@
 		 * handler.
 		 */
-		if (as_page_fault(page_16k, PF_ACCESS_READ, istate) ==
-		    AS_PF_FAULT) {
-			do_fast_data_access_mmu_miss_fault(istate, tag,
-			    __func__);
-		}
+		as_page_fault(page_16k, PF_ACCESS_READ, istate);
 	}
 }
@@ -332,9 +316,5 @@
 		 * handler.
 		 */		
-		if (as_page_fault(page_16k, PF_ACCESS_WRITE, istate) ==
-		    AS_PF_FAULT) {
-			do_fast_data_access_protection_fault(istate, tag,
-			    __func__);
-		}
+		as_page_fault(page_16k, PF_ACCESS_WRITE, istate);
 	}
 }
@@ -428,33 +408,4 @@
 
 #endif
-
-void do_fast_instruction_access_mmu_miss_fault(istate_t *istate,
-    uintptr_t va, const char *str)
-{
-	fault_if_from_uspace(istate, "%s, address=%p.", str, (void *) va);
-	panic_memtrap(istate, PF_ACCESS_EXEC, va, str);
-}
-
-void do_fast_data_access_mmu_miss_fault(istate_t *istate,
-    tlb_tag_access_reg_t tag, const char *str)
-{
-	uintptr_t va;
-
-	va = tag.vpn << MMU_PAGE_WIDTH;
-	fault_if_from_uspace(istate, "%s, page=%p (asid=%u).", str,
-	    (void *) va, tag.context);
-	panic_memtrap(istate, PF_ACCESS_UNKNOWN, va, str);
-}
-
-void do_fast_data_access_protection_fault(istate_t *istate,
-    tlb_tag_access_reg_t tag, const char *str)
-{
-	uintptr_t va;
-
-	va = tag.vpn << MMU_PAGE_WIDTH;
-	fault_if_from_uspace(istate, "%s, page=%p (asid=%u).", str,
-	    (void *) va, tag.context);
-	panic_memtrap(istate, PF_ACCESS_WRITE, va, str);
-}
 
 void describe_dmmu_fault(void)
Index: kernel/arch/sparc64/src/mm/sun4v/tlb.c
===================================================================
--- kernel/arch/sparc64/src/mm/sun4v/tlb.c	(revision 7852625a9a2570fb916023a5d354900c1c23d3ed)
+++ kernel/arch/sparc64/src/mm/sun4v/tlb.c	(revision 894d9ea4ebb3dc44d6c4351bbf2dd01289949937)
@@ -62,10 +62,4 @@
 static void itlb_pte_copy(pte_t *);
 static void dtlb_pte_copy(pte_t *, bool);
-static void do_fast_instruction_access_mmu_miss_fault(istate_t *, uintptr_t,
-    const char *);
-static void do_fast_data_access_mmu_miss_fault(istate_t *, uint64_t,
-    const char *);
-static void do_fast_data_access_protection_fault(istate_t *,
-    uint64_t, const char *);
 
 /*
@@ -235,8 +229,5 @@
 		 * handler.
 		 */
-		if (as_page_fault(va, PF_ACCESS_EXEC, istate) == AS_PF_FAULT) {
-			do_fast_instruction_access_mmu_miss_fault(istate,
-			    istate->tpc, __func__);
-		}
+		as_page_fault(va, PF_ACCESS_EXEC, istate);
 	}
 }
@@ -264,9 +255,7 @@
 		if (va == 0) {
 			/* NULL access in kernel */
-			do_fast_data_access_mmu_miss_fault(istate, page_and_ctx,
-			    __func__);
+			panic("NULL pointer dereference.");
 		}
-		do_fast_data_access_mmu_miss_fault(istate, page_and_ctx, "Unexpected "
-		    "kernel page fault.");
+		panic("Unexpected kernel page fault.");
 	}
 
@@ -287,8 +276,5 @@
 		 * handler.
 		 */		
-		if (as_page_fault(va, PF_ACCESS_READ, istate) == AS_PF_FAULT) {
-			do_fast_data_access_mmu_miss_fault(istate, page_and_ctx,
-			    __func__);
-		}
+		as_page_fault(va, PF_ACCESS_READ, istate);
 	}
 }
@@ -329,8 +315,5 @@
 		 * handler.
 		 */		
-		if (as_page_fault(va, PF_ACCESS_WRITE, istate) == AS_PF_FAULT) {
-			do_fast_data_access_protection_fault(istate, page_and_ctx,
-			    __func__);
-		}
+		as_page_fault(va, PF_ACCESS_WRITE, istate);
 	}
 }
@@ -346,30 +329,4 @@
 }
 
-void do_fast_instruction_access_mmu_miss_fault(istate_t *istate, uintptr_t va,
-    const char *str)
-{
-	fault_if_from_uspace(istate, "%s, address=%p.", str,
-	    (void *) va);
-	panic_memtrap(istate, PF_ACCESS_EXEC, va, str);
-}
-
-void do_fast_data_access_mmu_miss_fault(istate_t *istate,
-    uint64_t page_and_ctx, const char *str)
-{
-	fault_if_from_uspace(istate, "%s, page=%p (asid=%" PRId64 ").", str,
-	    (void *) DMISS_ADDRESS(page_and_ctx), DMISS_CONTEXT(page_and_ctx));
-	panic_memtrap(istate, PF_ACCESS_UNKNOWN, DMISS_ADDRESS(page_and_ctx),
-	    str);
-}
-
-void do_fast_data_access_protection_fault(istate_t *istate,
-    uint64_t page_and_ctx, const char *str)
-{
-	fault_if_from_uspace(istate, "%s, page=%p (asid=%" PRId64 ").", str,
-	    (void *) DMISS_ADDRESS(page_and_ctx), DMISS_CONTEXT(page_and_ctx));
-	panic_memtrap(istate, PF_ACCESS_WRITE, DMISS_ADDRESS(page_and_ctx),
-	    str);
-}
-
 /**
  * Describes the exact condition which caused the last DMMU fault.