summaryrefslogtreecommitdiff
path: root/kernel/proc.c
diff options
context:
space:
mode:
Diffstat (limited to 'kernel/proc.c')
-rw-r--r--kernel/proc.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/kernel/proc.c b/kernel/proc.c
index 659ca54..bc4b274 100644
--- a/kernel/proc.c
+++ b/kernel/proc.c
@@ -446,12 +446,13 @@ scheduler(void)
{
struct proc *p;
struct cpu *c = mycpu();
+
+ // Interrupts are disabled at first, but they must be
+ // enabled in order for the shell to get input.
+ intr_on();
c->proc = 0;
for(;;){
- // Avoid deadlock by ensuring that devices can interrupt.
- intr_on();
-
for(p = proc; p < &proc[NPROC]; p++) {
acquire(&p->lock);
if(p->state == RUNNABLE) {