From owner-svn-src-all@FreeBSD.ORG  Wed Sep  3 23:15:54 2014
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id C9E87D47;
 Wed,  3 Sep 2014 23:15:54 +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 B5AA415BA;
 Wed,  3 Sep 2014 23:15:54 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s83NFsCS027471;
 Wed, 3 Sep 2014 23:15:54 GMT (envelope-from gavin@FreeBSD.org)
Received: (from gavin@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s83NFsgt027470;
 Wed, 3 Sep 2014 23:15:54 GMT (envelope-from gavin@FreeBSD.org)
Message-Id: <201409032315.s83NFsgt027470@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: Wed, 3 Sep 2014 23:15:54 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r271065 - stable/10/sys/sys
X-SVN-Group: stable-10
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: Wed, 03 Sep 2014 23:15:54 -0000

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 :	\