xv6

Unnamed repository; edit this file 'description' to name the repository.
Log | Files | Refs | README | LICENSE

commit 1eadf4a8fcc34f79075bb61d3546be303745e461
parent 371ab7fa96f8e439f4008c973c37aa44ab6ed81e
Author: Robert Morris <rtm@csail.mit.edu>
Date:   Thu,  1 Sep 2011 13:26:03 -0400

Merge branch 'master' of git+ssh://amsterdam.csail.mit.edu/home/am0/6.828/xv6

Diffstat:
Mentry.S | 7+++----
Mx86.h | 1-
2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/entry.S b/entry.S @@ -17,8 +17,7 @@ #include "asm.h" #include "memlayout.h" #include "mmu.h" - -#define STACK 4096 +#include "param.h" # Multiboot header. Data to direct multiboot loader. .p2align 2 @@ -52,7 +51,7 @@ entry: movl %eax, %cr0 # Set up the stack pointer. - movl $(stack + STACK), %esp + movl $(stack + KSTACKSIZE), %esp # Jump to main(), and switch to executing at # high addresses. The indirect call is needed because @@ -61,4 +60,4 @@ entry: mov $main, %eax jmp *%eax -.comm stack, STACK +.comm stack, KSTACKSIZE diff --git a/x86.h b/x86.h @@ -170,7 +170,6 @@ xchg(volatile uint *addr, uint newval) return result; } -//PAGEBREAK! static inline void lcr0(uint val) {