D55027.id170941.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D55027.id170941.diff
View Options

	diff --git a/sys/compat/linuxkpi/common/include/linux/timer.h b/sys/compat/linuxkpi/common/include/linux/timer.h
	--- a/sys/compat/linuxkpi/common/include/linux/timer.h
	+++ b/sys/compat/linuxkpi/common/include/linux/timer.h
	@@ -84,23 +84,13 @@
	extern int mod_timer(struct timer_list *, int);
	extern void add_timer(struct timer_list *);
	extern void add_timer_on(struct timer_list *, int cpu);
	+extern int del_timer(struct timer_list *);
	+extern int del_timer_sync(struct timer_list *);

	extern int timer_delete(struct timer_list *);
	extern int timer_delete_sync(struct timer_list *);
	extern int timer_shutdown_sync(struct timer_list *);

	-static inline int
	-del_timer(struct timer_list *tl)
	-{
	- return (timer_delete(tl));
	-}
	-
	-static inline int
	-del_timer_sync(struct timer_list *tl)
	-{
	- return (timer_delete_sync(tl));
	-}
	-
	#define timer_pending(timer) callout_pending(&(timer)->callout)
	#define round_jiffies(j) \
	((int)(((j) + linux_timer_hz_mask) & ~linux_timer_hz_mask))
	diff --git a/sys/compat/linuxkpi/common/src/linux_compat.c b/sys/compat/linuxkpi/common/src/linux_compat.c
	--- a/sys/compat/linuxkpi/common/src/linux_compat.c
	+++ b/sys/compat/linuxkpi/common/src/linux_compat.c
	@@ -2069,6 +2069,18 @@
	return (1);
	}

	+int
	+del_timer(struct timer_list *timer)
	+{
	+ return (timer_delete(timer));
	+}
	+
	+int
	+del_timer_sync(struct timer_list *timer)
	+{
	+ return (timer_delete_sync(timer));
	+}
	+
	int
	timer_shutdown_sync(struct timer_list *timer)
	{