diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-28 10:16:27 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-28 10:16:27 -0700 |
| commit | 29d03fa12bc02c0f8085cd6bb06d11359a4bccaf (patch) | |
| tree | 0810a1b2bad0f853b270afed55eddc595ae8d2fc /kernel/hrtimer.c | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6 (diff) | |
| parent | posix_timer: Fix error path in timer_create (diff) | |
| download | linux-dev-29d03fa12bc02c0f8085cd6bb06d11359a4bccaf.tar.xz linux-dev-29d03fa12bc02c0f8085cd6bb06d11359a4bccaf.zip | |
Merge branch 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
posix_timer: Fix error path in timer_create
hrtimer: Avoid double seqlock
timers: Move local variable into else section
timers: Fix slack calculation really
Diffstat (limited to 'kernel/hrtimer.c')
| -rw-r--r-- | kernel/hrtimer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/hrtimer.c b/kernel/hrtimer.c index b9b134b35088..5c69e996bd0f 100644 --- a/kernel/hrtimer.c +++ b/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)); |