summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Morris <[email protected]>2011-09-01 13:26:03 -0400
committerRobert Morris <[email protected]>2011-09-01 13:26:03 -0400
commit1eadf4a8fcc34f79075bb61d3546be303745e461 (patch)
treea74e5a0291081a182d0fbec85a842f3fdc45f676
parent371ab7fa96f8e439f4008c973c37aa44ab6ed81e (diff)
parent6bb9221395b3bde9af6f5a2c3ccc118c0da2aab8 (diff)
downloadxv6-labs-1eadf4a8fcc34f79075bb61d3546be303745e461.tar.gz
xv6-labs-1eadf4a8fcc34f79075bb61d3546be303745e461.tar.bz2
xv6-labs-1eadf4a8fcc34f79075bb61d3546be303745e461.zip
Merge branch 'master' of git+ssh://amsterdam.csail.mit.edu/home/am0/6.828/xv6
-rw-r--r--entry.S7
-rw-r--r--x86.h1
2 files changed, 3 insertions, 5 deletions
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)
{