summaryrefslogtreecommitdiff
path: root/sysproc.c
diff options
context:
space:
mode:
authorRobert Morris <[email protected]>2017-08-08 13:27:06 -0400
committerRobert Morris <[email protected]>2017-08-08 13:27:06 -0400
commit14270288b7e5327832cdf6a8d9da52ef58fce652 (patch)
treeb604cb49fb049a14966418eda4589cd1271f8e53 /sysproc.c
parentaba8423c4a5ae01828040d04f668f07ec544dcd0 (diff)
parent825ce074b10a0e1f63fd3a1fe245220d04054e0a (diff)
downloadxv6-labs-14270288b7e5327832cdf6a8d9da52ef58fce652.tar.gz
xv6-labs-14270288b7e5327832cdf6a8d9da52ef58fce652.tar.bz2
xv6-labs-14270288b7e5327832cdf6a8d9da52ef58fce652.zip
Merge branch 'master' of g.csail.mit.edu:xv6-dev
Diffstat (limited to 'sysproc.c')
-rw-r--r--sysproc.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sysproc.c b/sysproc.c
index 6b585e0..0686d29 100644
--- a/sysproc.c
+++ b/sysproc.c
@@ -39,7 +39,7 @@ sys_kill(void)
int
sys_getpid(void)
{
- return proc->pid;
+ return myproc()->pid;
}
int
@@ -50,7 +50,7 @@ sys_sbrk(void)
if(argint(0, &n) < 0)
return -1;
- addr = proc->sz;
+ addr = myproc()->sz;
if(growproc(n) < 0)
return -1;
return addr;
@@ -67,7 +67,7 @@ sys_sleep(void)
acquire(&tickslock);
ticks0 = ticks;
while(ticks - ticks0 < n){
- if(proc->killed){
+ if(myproc()->killed){
release(&tickslock);
return -1;
}