diff options
| author | Robert Morris <[email protected]> | 2011-09-01 12:03:49 -0400 |
|---|---|---|
| committer | Robert Morris <[email protected]> | 2011-09-01 12:03:49 -0400 |
| commit | 62e3b8a92c6f8840cec8a0db13b2bcad10192b4a (patch) | |
| tree | 6186d2ac5e654ba71f8f45ae9956c560d7251dfc /entryother.S | |
| parent | 5a236924444db768813d726ae165d263856d8bff (diff) | |
| parent | d0f3efca650eccd5179e045cd07f7d723037defc (diff) | |
| download | xv6-labs-62e3b8a92c6f8840cec8a0db13b2bcad10192b4a.tar.gz xv6-labs-62e3b8a92c6f8840cec8a0db13b2bcad10192b4a.tar.bz2 xv6-labs-62e3b8a92c6f8840cec8a0db13b2bcad10192b4a.zip | |
Merge branch 'master' of git+ssh://amsterdam.csail.mit.edu/home/am0/6.828/xv6
Conflicts:
vm.c
Diffstat (limited to 'entryother.S')
| -rw-r--r-- | entryother.S | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/entryother.S b/entryother.S index 1dfbb1a..a24eaf6 100644 --- a/entryother.S +++ b/entryother.S @@ -12,11 +12,10 @@ # at an address in the low 2^16 bytes. # # Bootothers (in main.c) sends the STARTUPs one at a time. -# It copies this code (start) at 0x7000. -# It puts the address of a newly allocated per-core stack in start-4, -# the address of the place to jump to (mpenter) in start-8, and the physical -# address of enterpgdir in start-12. -# +# It copies this code (start) at 0x7000. It puts the address of +# a newly allocated per-core stack in start-4,the address of the +# place to jump to (mpenter) in start-8, and the physical address +# of enterpgdir in start-12. # # This code is identical to bootasm.S except: # - it does not need to enable A20 |