diff options
author | Frans Kaashoek <[email protected]> | 2017-08-07 14:35:05 -0400 |
---|---|---|
committer | Frans Kaashoek <[email protected]> | 2017-08-07 14:35:05 -0400 |
commit | 61cb32aa9bc457a6b39c5055cbf7fdd718dab7c2 (patch) | |
tree | 74f1a818d7722264d8a0fe825760d01ea7a83a9a /mmu.h | |
parent | 5cbccef811ce0347370723c0b931e108c306279e (diff) | |
parent | c9fa90f7e514f27fa1ac071cd9795f3830ab6a1b (diff) | |
download | xv6-labs-61cb32aa9bc457a6b39c5055cbf7fdd718dab7c2.tar.gz xv6-labs-61cb32aa9bc457a6b39c5055cbf7fdd718dab7c2.tar.bz2 xv6-labs-61cb32aa9bc457a6b39c5055cbf7fdd718dab7c2.zip |
Merge branch 'nogs'
Diffstat (limited to 'mmu.h')
-rw-r--r-- | mmu.h | 9 |
1 files changed, 4 insertions, 5 deletions
@@ -42,13 +42,12 @@ // various segment selectors. #define SEG_KCODE 1 // kernel code #define SEG_KDATA 2 // kernel data+stack -#define SEG_KCPU 3 // kernel per-cpu data -#define SEG_UCODE 4 // user code -#define SEG_UDATA 5 // user data+stack -#define SEG_TSS 6 // this process's task state +#define SEG_UCODE 3 // user code +#define SEG_UDATA 4 // user data+stack +#define SEG_TSS 5 // this process's task state // cpu->gdt[NSEGS] holds the above segments. -#define NSEGS 7 +#define NSEGS 6 //PAGEBREAK! #ifndef __ASSEMBLER__ |