Skip to content
Snippets Groups Projects
Commit 979c5686 authored by Robert Morris's avatar Robert Morris
Browse files

Merge remote branch 'origin/page' into page

parents ac090078 d55b2fac
No related branches found
No related tags found
No related merge requests found
...@@ -21,6 +21,7 @@ spinlock.c ...@@ -21,6 +21,7 @@ spinlock.c
proc.h proc.h
proc.c proc.c
swtch.S swtch.S
vm.c
kalloc.c kalloc.c
vm.c vm.c
......
...@@ -27,6 +27,7 @@ even: proc.h # mild preference ...@@ -27,6 +27,7 @@ even: proc.h # mild preference
right: proc.c # VERY important right: proc.c # VERY important
# setjmp.S either # setjmp.S either
# vm.c either
# kalloc.c either # kalloc.c either
# syscall.h either # syscall.h either
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment