summaryrefslogtreecommitdiff
path: root/kernel/defs.h
diff options
context:
space:
mode:
authorRobert Morris <[email protected]>2020-10-20 06:58:58 -0400
committerRobert Morris <[email protected]>2020-10-20 06:58:58 -0400
commit55ad99f7293fc6d639a30d36820a770ee71a6cae (patch)
treee7ad4e929e3f5d5e6e9bc023c8b221f597bd2b90 /kernel/defs.h
parent286b2f3c3306a621c415e8c7ce67bc2a6501998a (diff)
parent05a7db1a0a20187760d8a78ff7badfa4cc7e3314 (diff)
downloadxv6-labs-55ad99f7293fc6d639a30d36820a770ee71a6cae.tar.gz
xv6-labs-55ad99f7293fc6d639a30d36820a770ee71a6cae.tar.bz2
xv6-labs-55ad99f7293fc6d639a30d36820a770ee71a6cae.zip
Merge branch 'riscv' of g.csail.mit.edu:xv6-dev into riscv
Diffstat (limited to 'kernel/defs.h')
-rw-r--r--kernel/defs.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/kernel/defs.h b/kernel/defs.h
index 49aafdd..41098f4 100644
--- a/kernel/defs.h
+++ b/kernel/defs.h
@@ -86,6 +86,7 @@ int cpuid(void);
void exit(int);
int fork(void);
int growproc(int);
+void proc_mapstacks(pagetable_t);
pagetable_t proc_pagetable(struct proc *);
void proc_freepagetable(pagetable_t, uint64);
int kill(int);
@@ -156,7 +157,7 @@ int uartgetc(void);
// vm.c
void kvminit(void);
void kvminithart(void);
-void kvmmap(uint64, uint64, uint64, int);
+void kvmmap(pagetable_t, uint64, uint64, uint64, int);
int mappages(pagetable_t, uint64, uint64, uint64, int);
pagetable_t uvmcreate(void);
void uvminit(pagetable_t, uchar *, uint);