diff options
| author | Heiko Carstens | 2011-09-22 09:19:17 +0200 |
|---|---|---|
| committer | Thomas Gleixner | 2011-10-12 10:24:10 +0200 |
| commit | e35f95b36e43f67a6f806172555a152c11ea0a78 (patch) | |
| tree | a395fad1eaaba40ca87db6f0a37792f18d8fb82b /arch/s390/kernel | |
| parent | dw_apb_timer: constify clocksource name (diff) | |
| download | kernel-qcow2-linux-e35f95b36e43f67a6f806172555a152c11ea0a78.tar.gz kernel-qcow2-linux-e35f95b36e43f67a6f806172555a152c11ea0a78.tar.xz kernel-qcow2-linux-e35f95b36e43f67a6f806172555a152c11ea0a78.zip | |
time, s390: Get rid of compile warning
"s390: Use direct ktime path for s390 clockevent device" in linux-next
introduces this compile warning:
arch/s390/kernel/time.c: In function 's390_next_ktime':
arch/s390/kernel/time.c:118:2: warning:
comparison of distinct pointer types lacks a cast [enabled by default]
Just use a u64 instead of an s64 variable. This is not a problem since it
will always contain a positive value.
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Link: http://lkml.kernel.org/r/1316675957-5538-1-git-send-email-heiko.carstens@de.ibm.com
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/s390/kernel')
| -rw-r--r-- | arch/s390/kernel/time.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/s390/kernel/time.c b/arch/s390/kernel/time.c index c53716487e77..8d65bd0383fc 100644 --- a/arch/s390/kernel/time.c +++ b/arch/s390/kernel/time.c @@ -112,7 +112,7 @@ static void fixup_clock_comparator(unsigned long long delta) static int s390_next_ktime(ktime_t expires, struct clock_event_device *evt) { - s64 nsecs; + u64 nsecs; nsecs = ktime_to_ns(ktime_sub(expires, ktime_get_monotonic_offset())); do_div(nsecs, 125); |