diff --git a/[refs] b/[refs] index 2f67cd08b6d2..d44f5051d9ec 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 136f1e7a8cb7d17ff91706518549697071640ae4 +refs/heads/master: bc947631d1d532c758f8fcbdeb1f7fc2f4c863f8 diff --git a/trunk/kernel/sched.c b/trunk/kernel/sched.c index 5cd833bc2173..b81ed8703f70 100644 --- a/trunk/kernel/sched.c +++ b/trunk/kernel/sched.c @@ -1567,6 +1567,7 @@ int fastcall wake_up_state(struct task_struct *p, unsigned int state) return try_to_wake_up(p, state, 0); } +static void task_running_tick(struct rq *rq, struct task_struct *p); /* * Perform scheduler related setup for a newly forked process p. * p is forked by current. @@ -1627,7 +1628,7 @@ void fastcall sched_fork(struct task_struct *p, int clone_flags) * runqueue lock is not a problem. */ current->time_slice = 1; - scheduler_tick(); + task_running_tick(cpu_rq(cpu), current); } local_irq_enable(); put_cpu();