Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 11 Nov 2017 10:46:12 +0000 (UTC)
From:      Hans Petter Selasky <hselasky@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r325707 - head/sys/compat/linuxkpi/common/include/linux
Message-ID:  <201711111046.vABAkC5Q050320@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: hselasky
Date: Sat Nov 11 10:46:12 2017
New Revision: 325707
URL: https://svnweb.freebsd.org/changeset/base/325707

Log:
  Mask away return codes from del_timer() and del_timer_sync() because
  they are not the same like in Linux.
  
  MFC after:	1 week
  Sponsored by:	Mellanox Technologies

Modified:
  head/sys/compat/linuxkpi/common/include/linux/timer.h

Modified: head/sys/compat/linuxkpi/common/include/linux/timer.h
==============================================================================
--- head/sys/compat/linuxkpi/common/include/linux/timer.h	Sat Nov 11 09:34:11 2017	(r325706)
+++ head/sys/compat/linuxkpi/common/include/linux/timer.h	Sat Nov 11 10:46:12 2017	(r325707)
@@ -69,8 +69,8 @@ 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);
 
-#define	del_timer(timer)	callout_stop(&(timer)->timer_callout)
-#define	del_timer_sync(timer)	callout_drain(&(timer)->timer_callout)
+#define	del_timer(timer)	(void)callout_stop(&(timer)->timer_callout)
+#define	del_timer_sync(timer)	(void)callout_drain(&(timer)->timer_callout)
 #define	timer_pending(timer)	callout_pending(&(timer)->timer_callout)
 #define	round_jiffies(j)	\
 	((int)(((j) + linux_timer_hz_mask) & ~linux_timer_hz_mask))



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201711111046.vABAkC5Q050320>