diff --git a/[refs] b/[refs] index 94b62f45b08c..c1f9dfb7bafb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2abfb9e1d470f7082e5e20e4b11a271a0124211b +refs/heads/master: 174bd1994ec67a6e6191c4ed8e5dac17fa221b84 diff --git a/trunk/kernel/hrtimer.c b/trunk/kernel/hrtimer.c index b9b134b35088..5c69e996bd0f 100644 --- a/trunk/kernel/hrtimer.c +++ b/trunk/kernel/hrtimer.c @@ -89,7 +89,7 @@ static void hrtimer_get_softirq_time(struct hrtimer_cpu_base *base) do { seq = read_seqbegin(&xtime_lock); - xts = current_kernel_time(); + xts = __current_kernel_time(); tom = wall_to_monotonic; } while (read_seqretry(&xtime_lock, seq));