From 3b747dde22f6f86e6853104ae0a4327c31d5e1c8 Mon Sep 17 00:00:00 2001 From: Martin Schwidefsky Date: Fri, 17 Feb 2012 10:29:23 +0100 Subject: [PATCH] --- yaml --- r: 287756 b: refs/heads/master c: cf1eb40f8f5ea12c9e569e7282161fc7f194fd62 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/s390/kernel/time.c | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index eb86997dd38f..36ae7bb30863 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 656d9125376006cf696b0836f1c6723a892629ca +refs/heads/master: cf1eb40f8f5ea12c9e569e7282161fc7f194fd62 diff --git a/trunk/arch/s390/kernel/time.c b/trunk/arch/s390/kernel/time.c index fa02f443f5f6..14da278febbf 100644 --- a/trunk/arch/s390/kernel/time.c +++ b/trunk/arch/s390/kernel/time.c @@ -113,11 +113,14 @@ static void fixup_clock_comparator(unsigned long long delta) static int s390_next_ktime(ktime_t expires, struct clock_event_device *evt) { + struct timespec ts; u64 nsecs; - nsecs = ktime_to_ns(ktime_sub(expires, ktime_get_monotonic_offset())); + ts.tv_sec = ts.tv_nsec = 0; + monotonic_to_bootbased(&ts); + nsecs = ktime_to_ns(ktime_add(timespec_to_ktime(ts), expires)); do_div(nsecs, 125); - S390_lowcore.clock_comparator = TOD_UNIX_EPOCH + (nsecs << 9); + S390_lowcore.clock_comparator = sched_clock_base_cc + (nsecs << 9); set_clock_comparator(S390_lowcore.clock_comparator); return 0; }