summaryrefslogtreecommitdiffstats
path: root/kernel/sched.c
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>1997-03-25 23:40:36 +0000
committer <ralf@linux-mips.org>1997-03-25 23:40:36 +0000
commit7206675c40394c78a90e74812bbdbf8cf3cca1be (patch)
tree251895cf5a0008e2b4ce438cb01ad4d55fb5b97b /kernel/sched.c
parentbeb116954b9b7f3bb56412b2494b562f02b864b1 (diff)
Import of Linux/MIPS 2.1.14.2
Diffstat (limited to 'kernel/sched.c')
-rw-r--r--kernel/sched.c11
1 files changed, 4 insertions, 7 deletions
diff --git a/kernel/sched.c b/kernel/sched.c
index 8f88f88a3..98502b3fc 100644
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -126,7 +126,8 @@ static inline void add_to_runqueue(struct task_struct * p)
init_task.prev_run = p;
#ifdef __SMP__
/* this is safe only if called with cli()*/
- while(set_bit(31,&smp_process_available))
+ while(set_bit(31,&smp_process_available));
+#if 0
{
while(test_bit(31,&smp_process_available))
{
@@ -137,6 +138,7 @@ static inline void add_to_runqueue(struct task_struct * p)
}
}
}
+#endif
smp_process_available++;
clear_bit(31,&smp_process_available);
if ((0!=p->pid) && smp_threads_ready)
@@ -410,11 +412,6 @@ asmlinkage void schedule(void)
scheduling_in_interrupt:
printk("Aiee: scheduling in interrupt %p\n",
return_address());
-/*
- * System is probably fucked up anyway beyond a save landing; prevent
- * messages on the screen from scrolling away.
- */
-while(1);
}
#ifndef __alpha__
@@ -488,7 +485,7 @@ void wake_up_interruptible(struct wait_queue **q)
return;
bad:
printk("wait_queue is bad (eip = %p)\n",
- __builtin_return_address(0));
+ return_address());
printk(" q = %p\n",q);
printk(" *q = %p\n",*q);
}