diff options
author | Frans Kaashoek <[email protected]> | 2010-08-30 17:28:39 -0400 |
---|---|---|
committer | Frans Kaashoek <[email protected]> | 2010-08-30 17:28:39 -0400 |
commit | 791d81cadeb3b30ad6ec67c61086c6747f3d5ca2 (patch) | |
tree | 989981e6fce1479281968cf07dc932ec061097a9 /defs.h | |
parent | 156b307e28c52597fddea68baa5ca1f052520657 (diff) | |
parent | 3c9ff073e09abf15f241aa1812e04d8587c9925d (diff) | |
download | xv6-labs-791d81cadeb3b30ad6ec67c61086c6747f3d5ca2.tar.gz xv6-labs-791d81cadeb3b30ad6ec67c61086c6747f3d5ca2.tar.bz2 xv6-labs-791d81cadeb3b30ad6ec67c61086c6747f3d5ca2.zip |
Merge branch 'page' of git+ssh://amsterdam.csail.mit.edu/home/am0/6.828/xv6 into page
Diffstat (limited to 'defs.h')
-rw-r--r-- | defs.h | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -155,7 +155,7 @@ void uartputc(int); void pminit(void); void ksegment(void); void kvmalloc(void); -void vminit(void); +void vmenable(void); pde_t* setupkvm(void); char* uva2ka(pde_t*, char*); int allocuvm(pde_t*, char*, uint); |