diff options
| author | Frans Kaashoek <kaashoek@Frans-Kaashoeks-MacBook-Pro.local> | 2011-08-26 10:10:37 -0400 |
|---|---|---|
| committer | Frans Kaashoek <kaashoek@Frans-Kaashoeks-MacBook-Pro.local> | 2011-08-26 10:10:37 -0400 |
| commit | 16f205b5c9de7b49dcff44f2f14377799624083a (patch) | |
| tree | 1f601ceb6fdd9c1688d3538121764e3ea3f97bb9 | |
| parent | 3a5fa7ed9020eaf8ab843a16d26db7393b2ec072 (diff) | |
| parent | 41911afa452750086d81be097572573b27e1ecd6 (diff) | |
| download | xv6-labs-16f205b5c9de7b49dcff44f2f14377799624083a.tar.gz xv6-labs-16f205b5c9de7b49dcff44f2f14377799624083a.tar.bz2 xv6-labs-16f205b5c9de7b49dcff44f2f14377799624083a.zip | |
Merge branch 'master' of git+ssh://amsterdam.csail.mit.edu/home/am0/6.828/xv6
| -rw-r--r-- | bootasm.S | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -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 |