summaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
authorRobert Morris <[email protected]>2019-07-20 10:17:26 -0400
committerRobert Morris <[email protected]>2019-07-20 10:17:26 -0400
commit3333665ab68329543d6c51a1d819dc56e1b7cd5d (patch)
tree02f05df9bc4aee380285f7009eecd582bb207954 /kernel
parent2418ac380ca52429de50b801ab18568e93a53394 (diff)
downloadxv6-labs-3333665ab68329543d6c51a1d819dc56e1b7cd5d.tar.gz
xv6-labs-3333665ab68329543d6c51a1d819dc56e1b7cd5d.tar.bz2
xv6-labs-3333665ab68329543d6c51a1d819dc56e1b7cd5d.zip
not much
Diffstat (limited to 'kernel')
-rw-r--r--kernel/proc.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/proc.c b/kernel/proc.c
index 57528f9..e63cc9f 100644
--- a/kernel/proc.c
+++ b/kernel/proc.c
@@ -49,7 +49,7 @@ mycpu(void) {
return c;
}
-// Return the current struct proc *.
+// Return the current struct proc *, or zero if none.
struct proc*
myproc(void) {
push_off();
@@ -421,7 +421,7 @@ scheduler(void)
c->proc = 0;
for(;;){
- // Let devices interrupt when no lock is held.
+ // Avoid deadlock by ensuring that devices can interrupt.
intr_on();
for(p = proc; p < &proc[NPROC]; p++) {