From owner-svn-src-head@FreeBSD.ORG  Fri Aug 23 14:40:17 2013
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@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 ESMTP id 9C46339D;
 Fri, 23 Aug 2013 14:40:17 +0000 (UTC)
 (envelope-from davide@FreeBSD.org)
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))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 8B07B2BD9;
 Fri, 23 Aug 2013 14:40:17 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r7NEeHvd095742;
 Fri, 23 Aug 2013 14:40:17 GMT (envelope-from davide@svn.freebsd.org)
Received: (from davide@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r7NEeHMr095741;
 Fri, 23 Aug 2013 14:40:17 GMT (envelope-from davide@svn.freebsd.org)
Message-Id: <201308231440.r7NEeHMr095741@svn.freebsd.org>
From: Davide Italiano <davide@FreeBSD.org>
Date: Fri, 23 Aug 2013 14:40:17 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r254712 - 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-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 23 Aug 2013 14:40:17 -0000

Author: davide
Date: Fri Aug 23 14:40:17 2013
New Revision: 254712
URL: http://svnweb.freebsd.org/changeset/base/254712

Log:
  Fix the build and fix style.
  
  Pointy-hat to:	davide

Modified:
  head/sys/sys/callout.h

Modified: head/sys/sys/callout.h
==============================================================================
--- head/sys/sys/callout.h	Fri Aug 23 14:40:09 2013	(r254711)
+++ head/sys/sys/callout.h	Fri Aug 23 14:40:17 2013	(r254712)
@@ -71,8 +71,8 @@ void	_callout_init_lock(struct callout *
 #define	callout_init_mtx(c, mtx, flags)					\
 	_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 : \
+#define	callout_init_rm(c, rm, flags)					\
+	_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 :	\