diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-07-18 23:31:08 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-07-18 23:31:08 +0000 |
| commit | e8f9b6396e79654ea5932f64131cafbe8caadfb1 (patch) | |
| tree | 90cf8b3a2475a774369eda22247cab7874fd7bbf /kernel | |
| parent | d4c419dfaa853f5db107973976d4215ae648e976 (diff) | |
Merge with Linux 2.4.0-test5-pre2.
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/fork.c | 7 | ||||
| -rw-r--r-- | kernel/sched.c | 5 |
2 files changed, 4 insertions, 8 deletions
diff --git a/kernel/fork.c b/kernel/fork.c index 109219e0d..0de6a5f78 100644 --- a/kernel/fork.c +++ b/kernel/fork.c @@ -666,13 +666,6 @@ int do_fork(unsigned long clone_flags, unsigned long usp, struct pt_regs *regs) copy_flags(clone_flags, p); p->pid = get_pid(clone_flags); - /* - * This is a "shadow run" state. The process - * is marked runnable, but isn't actually on - * any run queue yet.. (that happens at the - * very end). - */ - p->state = TASK_RUNNING; p->run_list.next = NULL; p->run_list.prev = NULL; diff --git a/kernel/sched.c b/kernel/sched.c index 2f35e928a..935af0b42 100644 --- a/kernel/sched.c +++ b/kernel/sched.c @@ -209,8 +209,11 @@ static inline int preemption_goodness(struct task_struct * prev, struct task_str * We enter with the runqueue spinlock held, but we might end * up unlocking it early, so the caller must not unlock the * runqueue, it's always done by reschedule_idle(). + * + * This function must be inline as anything that saves and restores + * flags has to do so within the same register window on sparc (Anton) */ -static void reschedule_idle(struct task_struct * p, unsigned long flags) +static inline void reschedule_idle(struct task_struct * p, unsigned long flags) { #ifdef CONFIG_SMP int this_cpu = smp_processor_id(); |