diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-08 19:28:09 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-08 19:28:09 -0800 |
| commit | fbf07eac7bf21c262143194181bd97c5d18b8ceb (patch) | |
| tree | c9228b7d272f1e39472da28032605ecd1860e688 /arch/s390 | |
| parent | 60d8ce2cd6c283132928c11f3fd57ff4187287e0 (diff) | |
| parent | 8629ea2eaba8ca0de2e38ce1b4a825e16255976e (diff) | |
| download | blackbird-obmc-linux-fbf07eac7bf21c262143194181bd97c5d18b8ceb.tar.gz blackbird-obmc-linux-fbf07eac7bf21c262143194181bd97c5d18b8ceb.zip | |
Merge branch 'timers-for-linus-urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'timers-for-linus-urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
hrtimer: Fix /proc/timer_list regression
itimers: Fix racy writes to cpu_itimer fields
timekeeping: Fix clock_gettime vsyscall time warp
Diffstat (limited to 'arch/s390')
| -rw-r--r-- | arch/s390/kernel/time.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/s390/kernel/time.c b/arch/s390/kernel/time.c index 34162a0b2caa..68e1ecf5ebab 100644 --- a/arch/s390/kernel/time.c +++ b/arch/s390/kernel/time.c @@ -214,7 +214,8 @@ struct clocksource * __init clocksource_default_clock(void) return &clocksource_tod; } -void update_vsyscall(struct timespec *wall_time, struct clocksource *clock) +void update_vsyscall(struct timespec *wall_time, struct clocksource *clock, + u32 mult) { if (clock != &clocksource_tod) return; |
