From owner-svn-src-all@FreeBSD.ORG  Sun Jun  5 10:07:13 2011
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:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 43BCB1065678;
	Sun,  5 Jun 2011 10:07:13 +0000 (UTC)
	(envelope-from rwatson@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 334D98FC12;
	Sun,  5 Jun 2011 10:07:13 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p55A7DAp050921;
	Sun, 5 Jun 2011 10:07:13 GMT (envelope-from rwatson@svn.freebsd.org)
Received: (from rwatson@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p55A7DAn050912;
	Sun, 5 Jun 2011 10:07:13 GMT (envelope-from rwatson@svn.freebsd.org)
Message-Id: <201106051007.p55A7DAn050912@svn.freebsd.org>
From: Robert Watson <rwatson@FreeBSD.org>
Date: Sun, 5 Jun 2011 10:07:13 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r222709 - head/sys/sys
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
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/listinfo/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: Sun, 05 Jun 2011 10:07:13 -0000

Author: rwatson
Date: Sun Jun  5 10:07:12 2011
New Revision: 222709
URL: http://svn.freebsd.org/changeset/base/222709

Log:
  Correct a last minute merge error for new M_HASHTYPE macros.  This didn't
  turn up as a build problem because the macros aren't used (yet).
  
  MFC after:	3 days
  Sponsored by:	Juniper Networks, Inc.

Modified:
  head/sys/sys/mbuf.h

Modified: head/sys/sys/mbuf.h
==============================================================================
--- head/sys/sys/mbuf.h	Sun Jun  5 07:55:51 2011	(r222708)
+++ head/sys/sys/mbuf.h	Sun Jun  5 10:07:12 2011	(r222709)
@@ -247,7 +247,7 @@ struct mbuf {
 #define	M_HASHTYPE_SET(m, v)	do {					\
 	(m)->m_flags &= ~M_HASHTYPEBITS;				\
 	(m)->m_flags |= ((v) << M_HASHTYPE_SHIFT);			\
-while (0)
+} while (0)
 #define	M_HASHTYPE_TEST(m, v)	(M_HASHTYPE_GET(m) == (v))
 
 /*