diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2017-08-20 11:46:46 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2017-08-20 11:46:46 +0200 |
| commit | 4e2a809703e2b2300438a425b0a3f2013b55fcc6 (patch) | |
| tree | b3233970c706fdd93f9d381c1f48186fe0f8a252 /kernel/time/timekeeping.c | |
| parent | 3cf294962df8fcde710eb5e762e0929e2ba49947 (diff) | |
| parent | 47b4a457e4cc816b3fdd2ee55c65fda8ea6de051 (diff) | |
| download | blackbird-op-linux-4e2a809703e2b2300438a425b0a3f2013b55fcc6.tar.gz blackbird-op-linux-4e2a809703e2b2300438a425b0a3f2013b55fcc6.zip | |
Merge branch 'fortglx/4.14/time' of https://git.linaro.org/people/john.stultz/linux into timers/core
Pull timekeepig updates from John Stultz
- kselftest improvements
- Use the proper timekeeper in the debug code
- Prevent accessing an unavailable wakeup source in the alarmtimer sysfs
interface.
Diffstat (limited to 'kernel/time/timekeeping.c')
| -rw-r--r-- | kernel/time/timekeeping.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c index cedafa008de5..8f5866981883 100644 --- a/kernel/time/timekeeping.c +++ b/kernel/time/timekeeping.c @@ -2066,7 +2066,7 @@ void update_wall_time(void) goto out; /* Do some additional sanity checking */ - timekeeping_check_update(real_tk, offset); + timekeeping_check_update(tk, offset); /* * With NO_HZ we may have to accumulate many cycle_intervals |
