Commit 920f3d58 authored by Linus Torvalds's avatar Linus Torvalds

Fix overenthusiastic ia64 merge.

That preempt_count really is supposed to be unconditional,
architectures please take note and add to your thread info.
parent 93234a6b
......@@ -1452,10 +1452,8 @@ void __init init_idle(task_t *idle, int cpu)
set_tsk_need_resched(idle);
__restore_flags(flags);
#ifdef CONFIG_PREEMPT
/* Set the preempt count _outside_ the spinlocks! */
idle->thread_info->preempt_count = (idle->lock_depth >= 0);
#endif
}
extern void init_timervecs(void);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment