diff options
| author |   Paul Mundt <lethal@linux-sh.org> | 2010-01-06 15:49:08 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2010-01-06 15:49:08 +0900 |
| commit | fa94ddea2b29fdda7640672c8a933dbd901f0278 (patch) | |
| tree | 4e9204f1438f5ed44bff31e2abee598ad775321d /kernel/time.c | |
| parent | sh: select HAVE_HW_BREAKPOINT for all SUPERH32 CPUs. (diff) | |
| parent | sh: Fix up nommu build for out-of-line pgtable changes. (diff) | |
Merge branch 'master' into sh/hw-breakpoints
Diffstat (limited to 'kernel/time.c')
| -rw-r--r-- | kernel/time.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel/time.c b/kernel/time.c index c6324d96009e..804798005d19 100644 --- a/kernel/time.c +++ b/kernel/time.c @@ -136,6 +136,7 @@ static inline void warp_clock(void) write_seqlock_irq(&xtime_lock); wall_to_monotonic.tv_sec -= sys_tz.tz_minuteswest * 60; xtime.tv_sec += sys_tz.tz_minuteswest * 60; + update_xtime_cache(0); write_sequnlock_irq(&xtime_lock); clock_was_set(); } |