git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
[pandora-kernel.git]
/
kernel
/
softlockup.c
diff --git
a/kernel/softlockup.c
b/kernel/softlockup.c
index
0d4c789
..
4b493f6
100644
(file)
--- a/
kernel/softlockup.c
+++ b/
kernel/softlockup.c
@@
-155,11
+155,11
@@
void softlockup_tick(void)
* Wake up the high-prio watchdog task twice per
* threshold timespan.
*/
* Wake up the high-prio watchdog task twice per
* threshold timespan.
*/
- if (
now > touch_ts + softlockup_thresh/2
)
+ if (
time_after(now - softlockup_thresh/2, touch_ts)
)
wake_up_process(per_cpu(softlockup_watchdog, this_cpu));
/* Warn about unreasonable delays: */
wake_up_process(per_cpu(softlockup_watchdog, this_cpu));
/* Warn about unreasonable delays: */
- if (
now <= (touch_ts + softlockup_thresh
))
+ if (
time_before_eq(now - softlockup_thresh, touch_ts
))
return;
per_cpu(softlockup_print_ts, this_cpu) = touch_ts;
return;
per_cpu(softlockup_print_ts, this_cpu) = touch_ts;