summaryrefslogtreecommitdiff
path: root/trap.c
diff options
context:
space:
mode:
authorrsc <rsc>2007-09-27 20:09:40 +0000
committerrsc <rsc>2007-09-27 20:09:40 +0000
commit3807c1f20b5f7dca7ec7ca4bbe38bc5904e980ff (patch)
tree3d0ee391126d390d1c5b72c8b1d003d0db6807aa /trap.c
parent39c3fb1b157927058f24b72d43be6f15c1d422b7 (diff)
downloadxv6-labs-3807c1f20b5f7dca7ec7ca4bbe38bc5904e980ff.tar.gz
xv6-labs-3807c1f20b5f7dca7ec7ca4bbe38bc5904e980ff.tar.bz2
xv6-labs-3807c1f20b5f7dca7ec7ca4bbe38bc5904e980ff.zip
rename splhi/spllo to pushcli/popcli
Diffstat (limited to 'trap.c')
-rw-r--r--trap.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/trap.c b/trap.c
index 7ef32ff..0acc94b 100644
--- a/trap.c
+++ b/trap.c
@@ -45,7 +45,7 @@ trap(struct trapframe *tf)
}
// No interrupts during interrupt handling.
- splhi();
+ pushcli();
switch(tf->trapno){
case IRQ_OFFSET + IRQ_TIMER:
@@ -84,7 +84,7 @@ trap(struct trapframe *tf)
cp->killed = 1;
}
- spllo();
+ popcli();
// Force process exit if it has been killed and is in user space.
// (If it is still executing in the kernel, let it keep running