From 2ae96cb63029721b297ad1587b1c16462846b759 Mon Sep 17 00:00:00 2001 From: Stanislaw Gruszka Date: Tue, 25 May 2010 23:49:12 +0200 Subject: [PATCH] --- yaml --- r: 199187 b: refs/heads/master c: 174bd1994ec67a6e6191c4ed8e5dac17fa221b84 h: refs/heads/master i: 199185: 0e8825c46c7f49b40f1406feddafc03489c9e460 199183: a9d3a5f0b2fd6a6a0b52385c133d6a13f8b481c3 v: v3 --- [refs] | 2 +- trunk/kernel/hrtimer.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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));