Index: kernel/arch/ia64/src/mm/tlb.c
===================================================================
--- kernel/arch/ia64/src/mm/tlb.c	(revision d776329b69ef4b29a8601fe5affe7faa8c58b51d)
+++ kernel/arch/ia64/src/mm/tlb.c	(revision 560b81c47c7bd8b84ad01838e371562b523c1123)
@@ -492,4 +492,6 @@
 	bool found = page_mapping_find(AS, va, true, &t);
 	if (found) {
+		ASSERT(t.p);
+
 		/*
 		 * The mapping was found in software page hash table.
@@ -603,4 +605,6 @@
 	bool found = page_mapping_find(as, va, true, &t);
 	if (found) {
+		ASSERT(t.p);
+
 		/*
 		 * The mapping was found in the software page hash table.
Index: kernel/arch/sparc64/src/mm/sun4u/tlb.c
===================================================================
--- kernel/arch/sparc64/src/mm/sun4u/tlb.c	(revision d776329b69ef4b29a8601fe5affe7faa8c58b51d)
+++ kernel/arch/sparc64/src/mm/sun4u/tlb.c	(revision 560b81c47c7bd8b84ad01838e371562b523c1123)
@@ -201,4 +201,6 @@
 	bool found = page_mapping_find(AS, istate->tpc, true, &t);
 	if (found && PTE_EXECUTABLE(&t)) {
+		ASSERT(t.p);
+
 		/*
 		 * The mapping was found in the software page hash table.
@@ -256,4 +258,6 @@
 	bool found = page_mapping_find(as, page_16k, true, &t);
 	if (found) {
+		ASSERT(t.p);
+
 		/*
 		 * The mapping was found in the software page hash table.
@@ -297,4 +301,6 @@
 	bool found = page_mapping_find(as, page_16k, true, &t);
 	if (found && PTE_WRITABLE(&t)) {
+		ASSERT(t.p);
+
 		/*
 		 * The mapping was found in the software page hash table and is
Index: kernel/arch/sparc64/src/mm/sun4v/tlb.c
===================================================================
--- kernel/arch/sparc64/src/mm/sun4v/tlb.c	(revision d776329b69ef4b29a8601fe5affe7faa8c58b51d)
+++ kernel/arch/sparc64/src/mm/sun4v/tlb.c	(revision 560b81c47c7bd8b84ad01838e371562b523c1123)
@@ -215,4 +215,6 @@
 	bool found = page_mapping_find(AS, va, true, &t);
 	if (found && PTE_EXECUTABLE(&t)) {
+		ASSERT(t.p);
+
 		/*
 		 * The mapping was found in the software page hash table.
@@ -263,4 +265,6 @@
 	bool found = page_mapping_find(as, va, true, &t);
 	if (found) {
+		ASSERT(t.p);
+
 		/*
 		 * The mapping was found in the software page hash table.
@@ -299,4 +303,6 @@
 	bool found = page_mapping_find(as, va, true, &t);
 	if (found && PTE_WRITABLE(&t)) {
+		ASSERT(t.p);
+
 		/*
 		 * The mapping was found in the software page hash table and is