summaryrefslogtreecommitdiff
path: root/trapasm.S
diff options
context:
space:
mode:
authorFrans Kaashoek <[email protected]>2011-08-08 13:30:08 -0400
committerFrans Kaashoek <[email protected]>2011-08-08 13:30:08 -0400
commita56c8d609b24e4c1c3a8a5bacdced6ae53376ee2 (patch)
tree9d049eae2080a7c330fb7ac3ec9ff6e557a310e4 /trapasm.S
parent11b7438b1046eecca6135b52ddbe686008099fa5 (diff)
downloadxv6-labs-a56c8d609b24e4c1c3a8a5bacdced6ae53376ee2.tar.gz
xv6-labs-a56c8d609b24e4c1c3a8a5bacdced6ae53376ee2.tar.bz2
xv6-labs-a56c8d609b24e4c1c3a8a5bacdced6ae53376ee2.zip
One definition of several macros and constants
Diffstat (limited to 'trapasm.S')
-rw-r--r--trapasm.S4
1 files changed, 1 insertions, 3 deletions
diff --git a/trapasm.S b/trapasm.S
index 1cb2ce6..787727f 100644
--- a/trapasm.S
+++ b/trapasm.S
@@ -1,6 +1,4 @@
-#define SEG_KCODE 1 // kernel code
-#define SEG_KDATA 2 // kernel data+stack
-#define SEG_KCPU 3 // kernel per-cpu data
+#include "mmu.h"
# vectors.S sends all traps here.
.globl alltraps