summaryrefslogtreecommitdiff
path: root/mmu.h
diff options
context:
space:
mode:
authorrsc <rsc>2007-09-27 16:47:50 +0000
committerrsc <rsc>2007-09-27 16:47:50 +0000
commit0fe118f3f6ce989282ca9825a8004e140276ecc8 (patch)
treeebc00f6efb47ab35d0818dd5fad928fd83e95b5c /mmu.h
parentc8919e65379f13005d1ba6f50a87adc72cdfb93d (diff)
downloadxv6-labs-0fe118f3f6ce989282ca9825a8004e140276ecc8.tar.gz
xv6-labs-0fe118f3f6ce989282ca9825a8004e140276ecc8.tar.bz2
xv6-labs-0fe118f3f6ce989282ca9825a8004e140276ecc8.zip
don't call it ss - that's the stack segment
Diffstat (limited to 'mmu.h')
-rw-r--r--mmu.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/mmu.h b/mmu.h
index fb6f749..71dd917 100644
--- a/mmu.h
+++ b/mmu.h
@@ -125,7 +125,7 @@ struct taskstate {
// Gate descriptors for interrupts and traps
struct gatedesc {
uint off_15_0 : 16; // low 16 bits of offset in segment
- uint ss : 16; // segment selector
+ uint cs : 16; // code segment selector
uint args : 5; // # args, 0 for interrupt/trap gates
uint rsv1 : 3; // reserved(should be zero I guess)
uint type : 4; // type(STS_{TG,IG32,TG32})
@@ -146,7 +146,7 @@ struct gatedesc {
#define SETGATE(gate, istrap, sel, off, d) \
{ \
(gate).off_15_0 = (uint) (off) & 0xffff; \
- (gate).ss = (sel); \
+ (gate).cs = (sel); \
(gate).args = 0; \
(gate).rsv1 = 0; \
(gate).type = (istrap) ? STS_TG32 : STS_IG32; \