diff options
| author | Robert Morris <[email protected]> | 2011-09-01 12:03:49 -0400 |
|---|---|---|
| committer | Robert Morris <[email protected]> | 2011-09-01 12:03:49 -0400 |
| commit | 62e3b8a92c6f8840cec8a0db13b2bcad10192b4a (patch) | |
| tree | 6186d2ac5e654ba71f8f45ae9956c560d7251dfc /memlayout.h | |
| parent | 5a236924444db768813d726ae165d263856d8bff (diff) | |
| parent | d0f3efca650eccd5179e045cd07f7d723037defc (diff) | |
| download | xv6-labs-62e3b8a92c6f8840cec8a0db13b2bcad10192b4a.tar.gz xv6-labs-62e3b8a92c6f8840cec8a0db13b2bcad10192b4a.tar.bz2 xv6-labs-62e3b8a92c6f8840cec8a0db13b2bcad10192b4a.zip | |
Merge branch 'master' of git+ssh://amsterdam.csail.mit.edu/home/am0/6.828/xv6
Conflicts:
vm.c
Diffstat (limited to 'memlayout.h')
| -rw-r--r-- | memlayout.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/memlayout.h b/memlayout.h index e155e07..cd4433d 100644 --- a/memlayout.h +++ b/memlayout.h @@ -1,10 +1,10 @@ // Memory layout #define EXTMEM 0x100000 // Start of extended memory -#define PHYSTOP 0xE000000 // Top physical memory (too hard to get from E820) +#define PHYSTOP 0xE000000 // Top physical memory #define DEVSPACE 0xFE000000 // Other devices are at high addresses -// Key addresses for address space layout (see kmap in vm.c for the layout) +// Key addresses for address space layout (see kmap in vm.c for layout) #define KERNBASE 0x80000000 // First kernel virtual address #define KERNLINK (KERNBASE+EXTMEM) // Address where kernel is linked |