aboutsummaryrefslogtreecommitdiff
path: root/sys/kern
diff options
context:
space:
mode:
authorStefan Eßer <se@FreeBSD.org>2013-12-19 21:35:33 +0000
committerStefan Eßer <se@FreeBSD.org>2013-12-19 21:35:33 +0000
commit774e8d906fab53914fed5248cc1278c7439abd91 (patch)
tree517869183555fc3180747847498d898697039654 /sys/kern
parent7455eb71a1727afb5280a732433f28f233c6706d (diff)
downloadsrc-774e8d906fab53914fed5248cc1278c7439abd91.tar.gz
src-774e8d906fab53914fed5248cc1278c7439abd91.zip
Fix compilation on 32 bit architectures and use INT64_MAX instead of
LONG_MAX for the upper bound check.
Notes
Notes: svn path=/head/; revision=259633
Diffstat (limited to 'sys/kern')
-rw-r--r--sys/kern/kern_event.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/sys/kern/kern_event.c b/sys/kern/kern_event.c
index 3981dcb30925..4113dc1fbe1a 100644
--- a/sys/kern/kern_event.c
+++ b/sys/kern/kern_event.c
@@ -523,11 +523,14 @@ knote_fork(struct knlist *list, int pid)
* XXX: EVFILT_TIMER should perhaps live in kern_time.c beside the
* interval timer support code.
*/
-static __inline sbintime_t
+static __inline sbintime_t
timer2sbintime(intptr_t data)
{
- if (data > LLONG_MAX / SBT_1MS)
- return LLONG_MAX;
+
+#ifdef __LP64__
+ if (data > INT64_MAX / SBT_1MS)
+ return INT64_MAX;
+#endif
return (SBT_1MS * data);
}