diff options
| author | Robert Morris <[email protected]> | 2010-08-30 10:23:27 -0400 |
|---|---|---|
| committer | Robert Morris <[email protected]> | 2010-08-30 10:23:27 -0400 |
| commit | 979c5686b7a0960e599916f93ea06476e9f25764 (patch) | |
| tree | 3192698293f2b9744adde1cbd7a20f9f54d93577 | |
| parent | ac090078c63c9b467fd723f6bb7f949c05e9b04b (diff) | |
| parent | d55b2fac074ac23e30c337014f40ae2156b31b60 (diff) | |
| download | xv6-labs-979c5686b7a0960e599916f93ea06476e9f25764.tar.gz xv6-labs-979c5686b7a0960e599916f93ea06476e9f25764.tar.bz2 xv6-labs-979c5686b7a0960e599916f93ea06476e9f25764.zip | |
Merge remote branch 'origin/page' into page
| -rw-r--r-- | runoff.list | 1 | ||||
| -rw-r--r-- | runoff.spec | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/runoff.list b/runoff.list index 3258398..f39ce18 100644 --- a/runoff.list +++ b/runoff.list @@ -21,6 +21,7 @@ spinlock.c proc.h proc.c swtch.S +vm.c kalloc.c vm.c diff --git a/runoff.spec b/runoff.spec index dbd6d5c..e4cfd42 100644 --- a/runoff.spec +++ b/runoff.spec @@ -27,6 +27,7 @@ even: proc.h # mild preference right: proc.c # VERY important # setjmp.S either +# vm.c either # kalloc.c either # syscall.h either |