aboutsummaryrefslogtreecommitdiff
path: root/sys/compat/linuxkpi/common/include/linux/timer.h
diff options
context:
space:
mode:
authorHans Petter Selasky <hselasky@FreeBSD.org>2017-08-10 13:05:40 +0000
committerHans Petter Selasky <hselasky@FreeBSD.org>2017-08-10 13:05:40 +0000
commitf6800be3ce6cfc0f141aa19d76279017fa43a2ea (patch)
treeff5119080e601f1982b1576ab23d17fac65c9ec5 /sys/compat/linuxkpi/common/include/linux/timer.h
parent2427dc7d95fb82dadbc88a44af2697387b889bbb (diff)
Notes
Diffstat (limited to 'sys/compat/linuxkpi/common/include/linux/timer.h')
-rw-r--r--sys/compat/linuxkpi/common/include/linux/timer.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/compat/linuxkpi/common/include/linux/timer.h b/sys/compat/linuxkpi/common/include/linux/timer.h
index ffc2de763202..bee3acaabea9 100644
--- a/sys/compat/linuxkpi/common/include/linux/timer.h
+++ b/sys/compat/linuxkpi/common/include/linux/timer.h
@@ -41,7 +41,7 @@ struct timer_list {
struct callout timer_callout;
void (*function) (unsigned long);
unsigned long data;
- unsigned long expires;
+ int expires;
};
extern unsigned long linux_timer_hz_mask;
@@ -65,7 +65,7 @@ extern unsigned long linux_timer_hz_mask;
callout_init(&(timer)->timer_callout, 1); \
} while (0)
-extern void mod_timer(struct timer_list *, unsigned long);
+extern void mod_timer(struct timer_list *, int);
extern void add_timer(struct timer_list *);
extern void add_timer_on(struct timer_list *, int cpu);
@@ -73,7 +73,7 @@ extern void add_timer_on(struct timer_list *, int cpu);
#define del_timer_sync(timer) callout_drain(&(timer)->timer_callout)
#define timer_pending(timer) callout_pending(&(timer)->timer_callout)
#define round_jiffies(j) \
- ((unsigned long)(((j) + linux_timer_hz_mask) & ~linux_timer_hz_mask))
+ ((int)(((j) + linux_timer_hz_mask) & ~linux_timer_hz_mask))
#define round_jiffies_relative(j) round_jiffies(j)
#define round_jiffies_up(j) round_jiffies(j)
#define round_jiffies_up_relative(j) round_jiffies_up(j)