diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-12-07 11:01:26 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-12-07 11:01:26 -0800 |
| commit | 2c5ea0f2d8c7d4883dd0d8ec3c7e3f3640b4f814 (patch) | |
| tree | f6412441325195c16351822cff8da5f2ed5f1cfe /kernel/time/clockevents.c | |
| parent | fa2dd441df28b9fdfc68f84ae66f1b507cfff0e4 (diff) | |
| parent | e17bcb43a26a7111f851b5ff6d1258ecd355de75 (diff) | |
| download | talos-obmc-linux-2c5ea0f2d8c7d4883dd0d8ec3c7e3f3640b4f814.tar.gz talos-obmc-linux-2c5ea0f2d8c7d4883dd0d8ec3c7e3f3640b4f814.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86
* git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86:
ACPI: move timer broadcast before busmaster disable
clockevents: warn once when program_event() is called with negative expiry
hrtimers: avoid overflow for large relative timeouts
Diffstat (limited to 'kernel/time/clockevents.c')
| -rw-r--r-- | kernel/time/clockevents.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/kernel/time/clockevents.c b/kernel/time/clockevents.c index 822beebe664a..5fb139fef9fa 100644 --- a/kernel/time/clockevents.c +++ b/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) |
