diff --git a/[refs] b/[refs] index 11a0c4cf9e7b..19f039caccf2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c78a4bcd1a879b39fb7646c887b0c195f1018909 +refs/heads/master: 7f6575f1fb963d5231afbceecd3feadb6ab58cd3 diff --git a/trunk/kernel/sched/cputime.c b/trunk/kernel/sched/cputime.c index 9857329ed280..ed12cbb135f4 100644 --- a/trunk/kernel/sched/cputime.c +++ b/trunk/kernel/sched/cputime.c @@ -604,7 +604,7 @@ static unsigned long long vtime_delta(struct task_struct *tsk) { unsigned long long clock; - clock = sched_clock(); + clock = local_clock(); if (clock < tsk->vtime_snap) return 0;