From ea95a6654c3f921849f3541aa856a8806ebf571e Mon Sep 17 00:00:00 2001
From: Robert Morris <rtm@csail.mit.edu>
Date: Fri, 26 Jul 2019 04:53:46 -0400
Subject: trampin -> uservec trampout -> userret

---
 kernel/trampoline.S | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

(limited to 'kernel/trampoline.S')

diff --git a/kernel/trampoline.S b/kernel/trampoline.S
index d4066c9..bc31974 100644
--- a/kernel/trampoline.S
+++ b/kernel/trampoline.S
@@ -5,14 +5,15 @@
         # in user and kernel space so that it continues
         # to work when it switches page tables.
 	#
-	# kernel.ld causes trampout to be aligned
+	# kernel.ld causes userret to be aligned
         # to a page boundary.
         #
-.globl usertrap
-	.section trampoline
-.globl trampout
-trampout:
-        # trampout(trapframe, pagetable)
+	.section trampsec
+.globl trampoline
+trampoline:
+.globl userret
+userret:
+        # userret(trapframe, pagetable)
         # switch from kernel to user.
         # usertrapret() calls here.
 	# a0: p->tf in user page table
@@ -67,8 +68,8 @@ trampout:
         sret
 
 .align 4
-.globl trampin
-trampin:    
+.globl uservec
+uservec:    
 	#
         # trap.c set stvec to point here, so
         # user interrupts and exceptions start here,
-- 
cgit v1.2.3