summaryrefslogtreecommitdiff
path: root/trap.c
diff options
context:
space:
mode:
authorrsc <rsc>2006-07-17 01:52:13 +0000
committerrsc <rsc>2006-07-17 01:52:13 +0000
commitb5ee516575b4d2f1fd7de014230fee7cf8b6b538 (patch)
tree158b9cf0466e66ac80c96d948a12ae67afcb1d9a /trap.c
parent857d60cb0c56df19a5125584c677aa56c4488e98 (diff)
downloadxv6-labs-b5ee516575b4d2f1fd7de014230fee7cf8b6b538.tar.gz
xv6-labs-b5ee516575b4d2f1fd7de014230fee7cf8b6b538.tar.bz2
xv6-labs-b5ee516575b4d2f1fd7de014230fee7cf8b6b538.zip
add uint and standardize on typedefs instead of unsigned
Diffstat (limited to 'trap.c')
-rw-r--r--trap.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/trap.c b/trap.c
index 41b8c8f..38baee0 100644
--- a/trap.c
+++ b/trap.c
@@ -8,7 +8,7 @@
#include "syscall.h"
struct Gatedesc idt[256];
-extern unsigned vectors[]; /* vectors.S, array of 256 entry point addresses */
+extern uint vectors[]; /* vectors.S, array of 256 entry point addresses */
extern void trapenter(void);
extern void trapenter1(void);
@@ -56,8 +56,8 @@ trap(struct Trapframe *tf)
}
if((read_eflags() & FL_IF) == 0)
panic("syscall returning but FL_IF clear");
- if(read_esp() < (unsigned)cp->kstack ||
- read_esp() >= (unsigned)cp->kstack + KSTACKSIZE)
+ if(read_esp() < (uint)cp->kstack ||
+ read_esp() >= (uint)cp->kstack + KSTACKSIZE)
panic("trap ret esp wrong");
if(cp->killed)
proc_exit();