From 5be0c466b9f9fcb0d3abf2f951f08503ad5ee0d6 Mon Sep 17 00:00:00 2001 From: bz Date: Wed, 19 Oct 2011 10:08:58 +0000 Subject: [PATCH] In the non-FreeBSD case we do not expect PF_LOCK and friends to do anything. MFC after: 3 days --- sys/contrib/pf/net/pfvar.h | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/sys/contrib/pf/net/pfvar.h b/sys/contrib/pf/net/pfvar.h index 2aa4bbf5d2e4..4098691452d4 100644 --- a/sys/contrib/pf/net/pfvar.h +++ b/sys/contrib/pf/net/pfvar.h @@ -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(); \