svn commit: r271065 - stable/10/sys/sys

[Gavin Atkinson]

Author: gavin
Date: Wed Sep  3 23:15:54 2014
New Revision: 271065
URL: http://svnweb.freebsd.org/changeset/base/271065

Log:
  Merge r270259 from head:
  
    Add a missing brace to callout_init_rm() to fix syntax.

Modified:
  stable/10/sys/sys/callout.h
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/sys/callout.h
==============================================================================
--- stable/10/sys/sys/callout.h	Wed Sep  3 23:14:26 2014	(r271064)
+++ stable/10/sys/sys/callout.h	Wed Sep  3 23:15:54 2014	(r271065)
@@ -72,7 +72,7 @@ void	_callout_init_lock(struct callout *
 	_callout_init_lock((c), ((mtx) != NULL) ? &(mtx)->lock_object :	\
 	    NULL, (flags))
 #define	callout_init_rm(c, rm, flags)					\
-	_callout_init_lock((c), ((rm != NULL) ? &(rm)->lock_object : 	\
+	_callout_init_lock((c), ((rm) != NULL) ? &(rm)->lock_object : 	\
 	    NULL, (flags))
 #define	callout_init_rw(c, rw, flags)					\
 	_callout_init_lock((c), ((rw) != NULL) ? &(rw)->lock_object :	\