diff --git a/[refs] b/[refs] index af66ab401450..1fd32fe02555 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c0c87734f125d2fa8ebc70310f3257fa6209f2b6 +refs/heads/master: a83bc47c33ab182f1e48977fd5a04024d713c75e diff --git a/trunk/kernel/sched_clock.c b/trunk/kernel/sched_clock.c index ee7cce5029ce..28ff6bf5e02b 100644 --- a/trunk/kernel/sched_clock.c +++ b/trunk/kernel/sched_clock.c @@ -237,8 +237,8 @@ void sched_clock_tick(void) WARN_ON_ONCE(!irqs_disabled()); - now = sched_clock(); now_gtod = ktime_to_ns(ktime_get()); + now = sched_clock(); __raw_spin_lock(&scd->lock); __update_sched_clock(scd, now, NULL);