summaryrefslogtreecommitdiff
path: root/sleeplock.c
diff options
context:
space:
mode:
authorFrans Kaashoek <[email protected]>2017-08-07 14:35:05 -0400
committerFrans Kaashoek <[email protected]>2017-08-07 14:35:05 -0400
commit61cb32aa9bc457a6b39c5055cbf7fdd718dab7c2 (patch)
tree74f1a818d7722264d8a0fe825760d01ea7a83a9a /sleeplock.c
parent5cbccef811ce0347370723c0b931e108c306279e (diff)
parentc9fa90f7e514f27fa1ac071cd9795f3830ab6a1b (diff)
downloadxv6-labs-61cb32aa9bc457a6b39c5055cbf7fdd718dab7c2.tar.gz
xv6-labs-61cb32aa9bc457a6b39c5055cbf7fdd718dab7c2.tar.bz2
xv6-labs-61cb32aa9bc457a6b39c5055cbf7fdd718dab7c2.zip
Merge branch 'nogs'
Diffstat (limited to 'sleeplock.c')
-rw-r--r--sleeplock.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sleeplock.c b/sleeplock.c
index 2ded78d..d0e4d91 100644
--- a/sleeplock.c
+++ b/sleeplock.c
@@ -27,7 +27,7 @@ acquiresleep(struct sleeplock *lk)
sleep(lk, &lk->lk);
}
lk->locked = 1;
- lk->pid = proc->pid;
+ lk->pid = myproc()->pid;
release(&lk->lk);
}