diff --git a/[refs] b/[refs] index f62f3f6855ce..b68889a5e100 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: af52a90a14cdaa54ecbfb6e6982abb13466a4b56 +refs/heads/master: 2b8a0cf4890d7537a77b51caa8f508e4a05a0e67 diff --git a/trunk/kernel/sched_clock.c b/trunk/kernel/sched_clock.c index 97159e225a77..55fca1e9e12a 100644 --- a/trunk/kernel/sched_clock.c +++ b/trunk/kernel/sched_clock.c @@ -203,8 +203,8 @@ u64 sched_clock_cpu(int cpu) now -= my_scd->tick_raw; now += scd->tick_raw; - now -= my_scd->tick_gtod; - now += scd->tick_gtod; + now += my_scd->tick_gtod; + now -= scd->tick_gtod; __raw_spin_unlock(&my_scd->lock); } else {