diff options
author | Frans Kaashoek <[email protected]> | 2016-09-02 08:36:14 -0400 |
---|---|---|
committer | Frans Kaashoek <[email protected]> | 2016-09-02 08:36:14 -0400 |
commit | b8fd4cba1367656b464a8ac303e4141107712c39 (patch) | |
tree | 79c9cc8d58978ccf4184da731728002e1bec0361 /proc.c | |
parent | ae15515d80559ff95b315e3342c3baa00b87be1c (diff) | |
parent | bc8221a59c083811ee2d8c49c0342ea59caa6d51 (diff) | |
download | xv6-labs-b8fd4cba1367656b464a8ac303e4141107712c39.tar.gz xv6-labs-b8fd4cba1367656b464a8ac303e4141107712c39.tar.bz2 xv6-labs-b8fd4cba1367656b464a8ac303e4141107712c39.zip |
Merge branch 'master' of g.csail.mit.edu:xv6-dev
Diffstat (limited to 'proc.c')
-rw-r--r-- | proc.c | 7 |
1 files changed, 6 insertions, 1 deletions
@@ -302,7 +302,12 @@ scheduler(void) } // Enter scheduler. Must hold only ptable.lock -// and have changed proc->state. +// and have changed proc->state. Saves and restores +// intena because intena is a property of this +// kernel thread, not this CPU. It should +// be proc->intena and proc->ncli, but that would +// break in the few places where a lock is held but +// there's no process. void sched(void) { |