summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrans Kaashoek <[email protected]>2019-08-19 18:12:19 -0400
committerFrans Kaashoek <[email protected]>2019-08-19 18:12:19 -0400
commit21ad8c76bc9975f2223c136ba254deda2ab8036d (patch)
treee4db1b87d277961a3575cadb7a19f150acd4ff20
parentce565ae04a62f28cfa480707ee9c190719cb8168 (diff)
downloadxv6-labs-21ad8c76bc9975f2223c136ba254deda2ab8036d.tar.gz
xv6-labs-21ad8c76bc9975f2223c136ba254deda2ab8036d.tar.bz2
xv6-labs-21ad8c76bc9975f2223c136ba254deda2ab8036d.zip
A few now unused DOC
-rw-r--r--kernel/pipe.c4
-rw-r--r--kernel/proc.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/kernel/pipe.c b/kernel/pipe.c
index c3a8acf..e358283 100644
--- a/kernel/pipe.c
+++ b/kernel/pipe.c
@@ -88,13 +88,13 @@ pipewrite(struct pipe *pi, uint64 addr, int n)
return -1;
}
wakeup(&pi->nread);
- sleep(&pi->nwrite, &pi->lock); //DOC: pipewrite-sleep
+ sleep(&pi->nwrite, &pi->lock);
}
if(copyin(pr->pagetable, &ch, addr + i, 1) == -1)
break;
pi->data[pi->nwrite++ % PIPESIZE] = ch;
}
- wakeup(&pi->nread); //DOC: pipewrite-wakeup1
+ wakeup(&pi->nread);
release(&pi->lock);
return n;
}
diff --git a/kernel/proc.c b/kernel/proc.c
index 3d65b46..428fdb0 100644
--- a/kernel/proc.c
+++ b/kernel/proc.c
@@ -476,7 +476,7 @@ void
yield(void)
{
struct proc *p = myproc();
- acquire(&p->lock); //DOC: yieldlock
+ acquire(&p->lock);
p->state = RUNNABLE;
sched();
release(&p->lock);
@@ -531,7 +531,7 @@ sleep(void *chan, struct spinlock *lk)
p->chan = 0;
// Reacquire original lock.
- if(lk != &p->lock){ //DOC: sleeplock2
+ if(lk != &p->lock){
release(&p->lock);
acquire(lk);
}