From owner-svn-src-all@FreeBSD.ORG  Thu Aug 21 07:52:51 2014
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id A978CBE6;
 Thu, 21 Aug 2014 07:52:51 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 95503336D;
 Thu, 21 Aug 2014 07:52:51 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7L7qps7017963;
 Thu, 21 Aug 2014 07:52:51 GMT (envelope-from gavin@FreeBSD.org)
Received: (from gavin@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7L7qpXZ017962;
 Thu, 21 Aug 2014 07:52:51 GMT (envelope-from gavin@FreeBSD.org)
Message-Id: <201408210752.s7L7qpXZ017962@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: gavin set sender to
 gavin@FreeBSD.org using -f
From: Gavin Atkinson <gavin@FreeBSD.org>
Date: Thu, 21 Aug 2014 07:52:51 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r270259 - head/sys/sys
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 21 Aug 2014 07:52:51 -0000

Author: gavin
Date: Thu Aug 21 07:52:51 2014
New Revision: 270259
URL: http://svnweb.freebsd.org/changeset/base/270259

Log:
  Add a missing brace to callout_init_rm() to fix syntax.
  
  MFC after:	1 week

Modified:
  head/sys/sys/callout.h

Modified: head/sys/sys/callout.h
==============================================================================
--- head/sys/sys/callout.h	Thu Aug 21 04:31:48 2014	(r270258)
+++ head/sys/sys/callout.h	Thu Aug 21 07:52:51 2014	(r270259)
@@ -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 :	\