diff options
| author | Frans Kaashoek <[email protected]> | 2022-08-23 11:01:06 -0400 |
|---|---|---|
| committer | Frans Kaashoek <[email protected]> | 2022-08-23 11:01:06 -0400 |
| commit | ccb7bd14c7303a77f8f99928e2297ddd815674b1 (patch) | |
| tree | ac9fc9f6773c87d5adc8ded3bc8bc3a0145e85cd /kernel/defs.h | |
| parent | 4cd4d194b8827af4971a81ad28968499925f884f (diff) | |
| parent | 8621be8f3d105cd73ffbc681f9810d04b083b0ae (diff) | |
| download | xv6-labs-ccb7bd14c7303a77f8f99928e2297ddd815674b1.tar.gz xv6-labs-ccb7bd14c7303a77f8f99928e2297ddd815674b1.tar.bz2 xv6-labs-ccb7bd14c7303a77f8f99928e2297ddd815674b1.zip | |
Merge branch 'riscv' into uvm-perm
Diffstat (limited to 'kernel/defs.h')
| -rw-r--r-- | kernel/defs.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/kernel/defs.h b/kernel/defs.h index 5cf2de2..95fb94b 100644 --- a/kernel/defs.h +++ b/kernel/defs.h @@ -90,6 +90,8 @@ void proc_mapstacks(pagetable_t); pagetable_t proc_pagetable(struct proc *); void proc_freepagetable(pagetable_t, uint64); int kill(int); +int killed(struct proc*); +void setkilled(struct proc*); struct cpu* mycpu(void); struct cpu* getmycpu(void); struct proc* myproc(); @@ -132,9 +134,9 @@ int strncmp(const char*, const char*, uint); char* strncpy(char*, const char*, int); // syscall.c -int argint(int, int*); +void argint(int, int*); int argstr(int, char*, int); -int argaddr(int, uint64 *); +void argaddr(int, uint64 *); int fetchstr(uint64, char*, int); int fetchaddr(uint64, uint64*); void syscall(); |