From efd55826d81e53a5752d14892d2a61165bb177a8 Mon Sep 17 00:00:00 2001 From: Thomas Gleixner Date: Fri, 7 Dec 2007 19:16:17 +0100 Subject: [PATCH] --- yaml --- r: 74710 b: refs/heads/master c: 167b1de3ee4e50d65a2bd0a2667c9cd48faf54f3 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/kernel/time/clockevents.c | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 44f97621dfd0..c961d1b0952b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 62f0f61e6673e67151a7c8c0f9a09c7ea43fe2b5 +refs/heads/master: 167b1de3ee4e50d65a2bd0a2667c9cd48faf54f3 diff --git a/trunk/kernel/time/clockevents.c b/trunk/kernel/time/clockevents.c index 822beebe664a..5fb139fef9fa 100644 --- a/trunk/kernel/time/clockevents.c +++ b/trunk/kernel/time/clockevents.c @@ -78,6 +78,11 @@ int clockevents_program_event(struct clock_event_device *dev, ktime_t expires, unsigned long long clc; int64_t delta; + if (unlikely(expires.tv64 < 0)) { + WARN_ON_ONCE(1); + return -ETIME; + } + delta = ktime_to_ns(ktime_sub(expires, now)); if (delta <= 0)