summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrtm <rtm>2006-06-22 20:50:32 +0000
committerrtm <rtm>2006-06-22 20:50:32 +0000
commit7df1310b2a8e0d825287d64d09c2c8d82e51907c (patch)
tree21b4019f8f6edfe3f1792d1c5912cbd0b0309c7a
parentdf5cc91659b0a2190072e6fc305060c8de95ed82 (diff)
downloadxv6-labs-7df1310b2a8e0d825287d64d09c2c8d82e51907c.tar.gz
xv6-labs-7df1310b2a8e0d825287d64d09c2c8d82e51907c.tar.bz2
xv6-labs-7df1310b2a8e0d825287d64d09c2c8d82e51907c.zip
bug in trapret
-rw-r--r--trapasm.S1
1 files changed, 1 insertions, 0 deletions
diff --git a/trapasm.S b/trapasm.S
index c0cfd8e..4ae023d 100644
--- a/trapasm.S
+++ b/trapasm.S
@@ -24,6 +24,7 @@ alltraps:
trapret:
push $kernel_lock
call release_spinlock
+ addl $4, %esp
popal
popl %es
popl %ds