# HG changeset patch
# User Paul Boddie <paul@boddie.org.uk>
# Date 1461683507 -7200
# Node ID ce7a8d4ecbb6ad88e6e232cfe76840fba491487d
# Parent  62db3a0bc7465df6000d6316b779d6444f96be82
Presumably nothing special needs doing after TLB exception handling, so a direct
return from exception is performed (as was done before).

diff -r 62db3a0bc746 -r ce7a8d4ecbb6 stage2/entry.S
--- a/stage2/entry.S	Tue Apr 26 16:34:43 2016 +0200
+++ b/stage2/entry.S	Tue Apr 26 17:11:47 2016 +0200
@@ -25,7 +25,6 @@
 .globl _exc_entry
 .globl _irq_entry
 .globl _end_entries
-.globl _enter_task
 .set noreorder
 
 #include "paging.h"
@@ -67,7 +66,7 @@
 	tlbwr
 	nop
 
-	j _tlb_exit
+	eret
 	nop
 
 _tlb_entry_direct:
@@ -88,22 +87,9 @@
 	tlbwr
 	nop
 
-	/* For ASID == 0... */
-
-	andi $k1, $k0, 0xff			/* ASID */
-	bnez $k1, _tlb_exit
-	nop
 	eret
 	nop
 
-_tlb_exit:
-	/* For ASID != 0... */
-
-	lui $k0, %hi(enter_task)
-	ori $k0, $k0, %lo(enter_task)
-	jr $k0
-	nop
-
 _exc_entry:
 	/* Handle TLB refill exceptions. */