From owner-svn-src-all@FreeBSD.ORG  Wed Oct 19 10:08:59 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 33F69106564A;
	Wed, 19 Oct 2011 10:08:59 +0000 (UTC) (envelope-from bz@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 243448FC08;
	Wed, 19 Oct 2011 10:08:59 +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 p9JA8xRm015407;
	Wed, 19 Oct 2011 10:08:59 GMT (envelope-from bz@svn.freebsd.org)
Received: (from bz@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p9JA8xQ3015405;
	Wed, 19 Oct 2011 10:08:59 GMT (envelope-from bz@svn.freebsd.org)
Message-Id: <201110191008.p9JA8xQ3015405@svn.freebsd.org>
From: "Bjoern A. Zeeb" <bz@FreeBSD.org>
Date: Wed, 19 Oct 2011 10:08:59 +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: r226533 - head/sys/contrib/pf/net
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: Wed, 19 Oct 2011 10:08:59 -0000

Author: bz
Date: Wed Oct 19 10:08:58 2011
New Revision: 226533
URL: http://svn.freebsd.org/changeset/base/226533

Log:
  In the non-FreeBSD case we do not expect PF_LOCK and friends to do anything.
  
  MFC after:	3 days

Modified:
  head/sys/contrib/pf/net/pfvar.h

Modified: head/sys/contrib/pf/net/pfvar.h
==============================================================================
--- head/sys/contrib/pf/net/pfvar.h	Wed Oct 19 10:04:24 2011	(r226532)
+++ head/sys/contrib/pf/net/pfvar.h	Wed Oct 19 10:08:58 2011	(r226533)
@@ -251,19 +251,10 @@ VNET_DECLARE(struct mtx,	 pf_task_mtx);
 	mtx_unlock(&V_pf_task_mtx);			\
 } while(0)
 #else
-extern struct mtx pf_task_mtx;
-
-#define	PF_ASSERT(h)	mtx_assert(&pf_task_mtx, (h))
-
-#define	PF_LOCK()	do {				\
-	PF_ASSERT(MA_NOTOWNED);				\
-	mtx_lock(&pf_task_mtx);				\
-} while(0)
-#define	PF_UNLOCK()	do {				\
-	PF_ASSERT(MA_OWNED);				\
-	mtx_unlock(&pf_task_mtx);			\
-} while(0)
-#endif
+#define	PF_ASSERT(h)
+#define	PF_LOCK()
+#define	PF_UNLOCK()
+#endif /* __FreeBSD__ */
 
 #define	PF_COPYIN(uaddr, kaddr, len, r)		do {	\
 	PF_UNLOCK();					\