diff --git a/entry.S b/entry.S index 4fd85c6..3fe4eb5 100644 --- 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 index 0c3feae..503afdb 100644 --- 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) {