diff options
author | Robert Morris <[email protected]> | 2019-06-04 11:31:50 -0400 |
---|---|---|
committer | Robert Morris <[email protected]> | 2019-06-04 11:31:50 -0400 |
commit | cff3ce6e04ce4a353324630df788df21566807a6 (patch) | |
tree | 31040a8262b6de165a2f1d6cc7ead1db33e67a80 /sysproc.c | |
parent | 0e131b226336808c135795f5b9d7defc5a58b2ae (diff) | |
download | xv6-labs-cff3ce6e04ce4a353324630df788df21566807a6.tar.gz xv6-labs-cff3ce6e04ce4a353324630df788df21566807a6.tar.bz2 xv6-labs-cff3ce6e04ce4a353324630df788df21566807a6.zip |
more sbrk fixes
Diffstat (limited to 'sysproc.c')
-rw-r--r-- | sysproc.c | 23 |
1 files changed, 10 insertions, 13 deletions
@@ -39,24 +39,12 @@ sys_sbrk(void) if(argint(0, &n) < 0) return -1; - printf("sbrk(%d), sz was %d\n", n, (int)myproc()->sz); addr = myproc()->sz; if(growproc(n) < 0) return -1; return addr; } -#if 0 -int -sys_kill(void) -{ - int pid; - - if(argint(0, &pid) < 0) - return -1; - return kill(pid); -} - int sys_sleep(void) { @@ -78,6 +66,16 @@ sys_sleep(void) return 0; } +int +sys_kill(void) +{ + int pid; + + if(argint(0, &pid) < 0) + return -1; + return kill(pid); +} + // return how many clock tick interrupts have occurred // since start. int @@ -90,4 +88,3 @@ sys_uptime(void) release(&tickslock); return xticks; } -#endif |