summaryrefslogtreecommitdiff
path: root/kernel/defs.h
diff options
context:
space:
mode:
authorRobert Morris <[email protected]>2019-07-24 15:28:37 -0400
committerRobert Morris <[email protected]>2019-07-24 15:28:37 -0400
commit9a817bd134cd83c8a8c8cc96f022a0c22cc5bdb4 (patch)
tree6007c6292c5d07144f3fa27be732fe27223a87d5 /kernel/defs.h
parentda898a11b61fd36e430ffd89b495dd5693c66e30 (diff)
downloadxv6-labs-9a817bd134cd83c8a8c8cc96f022a0c22cc5bdb4.tar.gz
xv6-labs-9a817bd134cd83c8a8c8cc96f022a0c22cc5bdb4.tar.bz2
xv6-labs-9a817bd134cd83c8a8c8cc96f022a0c22cc5bdb4.zip
rationalize some vm function names
Diffstat (limited to 'kernel/defs.h')
-rw-r--r--kernel/defs.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/kernel/defs.h b/kernel/defs.h
index 926b138..5ad05ca 100644
--- a/kernel/defs.h
+++ b/kernel/defs.h
@@ -180,21 +180,21 @@ int uartgetc(void);
// vm.c
void kvminit(void);
void kvminithart(void);
+uint64 kvmpa(uint64);
+void kvmmap(uint64, uint64, uint64, int);
+int mappages(pagetable_t, uint64, uint64, uint64, int);
pagetable_t uvmcreate(void);
void uvminit(pagetable_t, uchar *, uint);
uint64 uvmalloc(pagetable_t, uint64, uint64);
uint64 uvmdealloc(pagetable_t, uint64, uint64);
int uvmcopy(pagetable_t, pagetable_t, uint64);
void uvmfree(pagetable_t, uint64);
-int mappages(pagetable_t, uint64, uint64, uint64, int);
-void unmappages(pagetable_t, uint64, uint64, int);
+void uvmunmap(pagetable_t, uint64, uint64, int);
+void uvmclear(pagetable_t, uint64);
uint64 walkaddr(pagetable_t, uint64);
int copyout(pagetable_t, uint64, char *, uint64);
int copyin(pagetable_t, char *, uint64, uint64);
int copyinstr(pagetable_t, char *, uint64, uint64);
-void kmap(uint64, uint64, uint64, int);
-uint64 kernelpa(uint64);
-void clearpteu(pagetable_t, uint64);
// plic.c
void plicinit(void);