From dc3bdd4ad937e9e3552ee4b96da81ae23b2adf36 Mon Sep 17 00:00:00 2001
From: Adrian Chadd <adrian@FreeBSD.org>
Date: Tue, 17 Dec 2013 03:06:21 +0000
Subject: [PATCH] Remove the invariants stuff I copy/paste'd from the mbuf code
 when setting up the UMA zone.

This should (a) be correct(er) and (b) it should build on non-amd64.

Pointed out by: glebius
---
 sys/kern/uipc_syscalls.c | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/sys/kern/uipc_syscalls.c b/sys/kern/uipc_syscalls.c
index c45597b677a..3243f562787 100644
--- a/sys/kern/uipc_syscalls.c
+++ b/sys/kern/uipc_syscalls.c
@@ -80,9 +80,6 @@ __FBSDID("$FreeBSD$");
 #include <compat/freebsd32/freebsd32_util.h>
 #endif
 
-#include <vm/uma.h>
-#include <vm/uma_int.h>
-#include <vm/uma_dbg.h>
 #include <net/vnet.h>
 
 #include <security/audit/audit.h>
@@ -95,6 +92,7 @@ __FBSDID("$FreeBSD$");
 #include <vm/vm_pager.h>
 #include <vm/vm_kern.h>
 #include <vm/vm_extern.h>
+#include <vm/uma.h>
 
 #if defined(INET) || defined(INET6)
 #ifdef SCTP
@@ -150,11 +148,7 @@ sf_sync_init(const void *unused)
 
 	zone_sfsync = uma_zcreate("sendfile_sync", sizeof(struct sendfile_sync),
 	    NULL, NULL,
-#ifdef	INVARIANTS
-	    trash_init, trash_fini,
-#else
 	    NULL, NULL,
-#endif
 	    UMA_ALIGN_CACHE,
 	    0);
 }