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

This commit is contained in:
Frans Kaashoek 2011-08-26 10:10:37 -04:00
commit 16f205b5c9

View file

@ -46,7 +46,7 @@ seta20.2:
//PAGEBREAK! //PAGEBREAK!
# Complete transition to 32-bit protected mode by using long jmp # 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. # translation, so that the mapping is still the identity mapping.
ljmp $(SEG_KCODE<<3), $start32 ljmp $(SEG_KCODE<<3), $start32