summaryrefslogtreecommitdiff
path: root/kernel/defs.h
diff options
context:
space:
mode:
authorFrans Kaashoek <[email protected]>2019-07-02 14:19:31 -0400
committerFrans Kaashoek <[email protected]>2019-07-02 14:19:31 -0400
commit1e4d7065d6582fd57d251dfe405afbbe68a55309 (patch)
treef5ba795c113d04f43fd49744d04519aeef3df4ef /kernel/defs.h
parent84c759fc02c7843b64a1bafc843cd80fe3c9d7ee (diff)
parentf59c1bf1d82da4b445c1cff10c228ea55fa035d4 (diff)
downloadxv6-labs-1e4d7065d6582fd57d251dfe405afbbe68a55309.tar.gz
xv6-labs-1e4d7065d6582fd57d251dfe405afbbe68a55309.tar.bz2
xv6-labs-1e4d7065d6582fd57d251dfe405afbbe68a55309.zip
Merge branch 'riscv' into riscv-proc
Diffstat (limited to 'kernel/defs.h')
-rw-r--r--kernel/defs.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/defs.h b/kernel/defs.h
index 1b397fe..bd89af0 100644
--- a/kernel/defs.h
+++ b/kernel/defs.h
@@ -185,9 +185,9 @@ pagetable_t uvmcreate(void);
void uvminit(pagetable_t, uchar *, uint);
uint64 uvmalloc(pagetable_t, uint64, uint64);
uint64 uvmdealloc(pagetable_t, uint64, uint64);
-void uvmcopy(pagetable_t, pagetable_t, uint64);
+int uvmcopy(pagetable_t, pagetable_t, uint64);
void uvmfree(pagetable_t, uint64);
-void mappages(pagetable_t, uint64, uint64, uint64, int);
+int mappages(pagetable_t, uint64, uint64, uint64, int);
void unmappages(pagetable_t, uint64, uint64, int);
uint64 walkaddr(pagetable_t, uint64);
int copyout(pagetable_t, uint64, char *, uint64);