From 2a11ce9a6629123b24ae6e0d9ae77fd56eb4e759 Mon Sep 17 00:00:00 2001 From: elektroschmock Date: Sat, 17 Nov 2012 23:52:57 +0100 Subject: timekeeping: fix a merge error Change-Id: I4edf332cb30c07f2828af5375b6957e7b23c9cae --- kernel/time/timekeeping.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c index 343ab2a..5928f95 100644 --- a/kernel/time/timekeeping.c +++ b/kernel/time/timekeeping.c @@ -649,7 +649,7 @@ static void update_sleep_time(struct timespec t) */ static void __timekeeping_inject_sleeptime(struct timespec *delta) { - if (!timespec_valid(delta)) { + if (!timespec_valid_strict(delta)) { printk(KERN_WARNING "__timekeeping_inject_sleeptime: Invalid " "sleep delta value!\n"); return; -- cgit v1.1