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 /runoff.list | |
| 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 'runoff.list')
| -rw-r--r-- | runoff.list | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/runoff.list b/runoff.list index ddd7062..e8884e0 100644 --- a/runoff.list +++ b/runoff.list @@ -8,10 +8,6 @@ asm.h mmu.h elf.h -# bootloader -bootasm.S -bootmain.c - # entering xv6 entry.S entryother.S @@ -22,12 +18,13 @@ spinlock.h spinlock.c # processes +vm.c proc.h proc.c swtch.S kalloc.c data.S -vm.c + # system calls traps.h vectors.pl @@ -45,8 +42,8 @@ fs.h file.h ide.c bio.c -fs.c log.c +fs.c file.c sysfile.c exec.c @@ -54,7 +51,6 @@ exec.c # pipes pipe.c - # string operations string.c @@ -76,7 +72,7 @@ usys.S init.c sh.c - - - +# bootloader +bootasm.S +bootmain.c |