diff --git a/[refs] b/[refs] index e3e6969e9901..694063780d7f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 42ac9e87fdd89b77fa2ca0a5226023c1c2d83226 +refs/heads/master: d3bf52e998056a6002b2aecfe1d25486376382ac diff --git a/trunk/kernel/sched.c b/trunk/kernel/sched.c index 30a29ad46eb1..8cb0a5769a16 100644 --- a/trunk/kernel/sched.c +++ b/trunk/kernel/sched.c @@ -4002,9 +4002,6 @@ void thread_group_times(struct task_struct *p, cputime_t *ut, cputime_t *st) /* * This function gets called by the timer code, with HZ frequency. * We call it with interrupts disabled. - * - * It also gets called by the fork code, when changing the parent's - * timeslices. */ void scheduler_tick(void) {