diff --git a/[refs] b/[refs] index ad617605ed1c..f5bffa1d81df 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bb29ab26863c022743143f27956cc0ca362f258c +refs/heads/master: 1b9f19c2125dd1021b9327111dc40b14b557ee12 diff --git a/trunk/kernel/sched.c b/trunk/kernel/sched.c index 6150cd70f448..2d23450e7614 100644 --- a/trunk/kernel/sched.c +++ b/trunk/kernel/sched.c @@ -67,13 +67,6 @@ unsigned long long __attribute__((weak)) sched_clock(void) return (unsigned long long)jiffies * (1000000000 / HZ); } -/* - * CPU frequency is/was unstable - start new by setting prev_clock_raw: - */ -void sched_clock_unstable_event(void) -{ -} - /* * Convert user-nice values [ -20 ... 0 ... 19 ] * to static priority [ MAX_RT_PRIO..MAX_PRIO-1 ], @@ -629,6 +622,20 @@ static inline struct rq *this_rq_lock(void) return rq; } +/* + * CPU frequency is/was unstable - start new by setting prev_clock_raw: + */ +void sched_clock_unstable_event(void) +{ + unsigned long flags; + struct rq *rq; + + rq = task_rq_lock(current, &flags); + rq->prev_clock_raw = sched_clock(); + rq->clock_unstable_events++; + task_rq_unlock(rq, &flags); +} + /* * resched_task - mark a task 'to be rescheduled now'. *