xv6

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

commit 16f205b5c9de7b49dcff44f2f14377799624083a
parent 3a5fa7ed9020eaf8ab843a16d26db7393b2ec072
Author: Frans Kaashoek <kaashoek@Frans-Kaashoeks-MacBook-Pro.local>
Date:   Fri, 26 Aug 2011 10:10:37 -0400

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

Diffstat:
Mbootasm.S | 2+-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bootasm.S b/bootasm.S @@ -46,7 +46,7 @@ seta20.2: //PAGEBREAK! # Complete transition to 32-bit protected mode by using long jmp - # to reload %cs and %eip. The segment registers are set up with no + # to reload %cs and %eip. The segment descriptors are set up with no # translation, so that the mapping is still the identity mapping. ljmp $(SEG_KCODE<<3), $start32