# HG changeset patch
# User Paul Boddie <paul@boddie.org.uk>
# Date 1461533206 -7200
# Node ID c345cbe0559740fbae39e53695cf1340c3f58db9
# Parent  02abb23dd68ec383f1e6a330646ec62178a889b8
Make sure that the task entry routine gets used after direct mapping updates.

diff -r 02abb23dd68e -r c345cbe05597 stage2/entry.S
--- a/stage2/entry.S	Sun Apr 24 22:54:15 2016 +0200
+++ b/stage2/entry.S	Sun Apr 24 23:26:46 2016 +0200
@@ -75,10 +75,7 @@
 	tlbwr
 	nop
 
-	lui $k0, %hi(_enter_task)
-	ori $k0, $k0, %lo(_enter_task)
-	lw $k1, 0($k0)
-	jr $k1
+	j _tlb_exit
 	nop
 
 _tlb_entry_direct:
@@ -98,7 +95,12 @@
 
 	tlbwr
 	nop
-	eret
+
+_tlb_exit:
+	lui $k0, %hi(_enter_task)
+	ori $k0, $k0, %lo(_enter_task)
+	lw $k1, 0($k0)
+	jr $k1
 	nop
 
 _exc_entry: