From owner-svn-src-all@FreeBSD.ORG  Tue Dec 17 03:06:22 2013
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 6DCF8A98;
 Tue, 17 Dec 2013 03:06:22 +0000 (UTC)
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 5A9131F73;
 Tue, 17 Dec 2013 03:06:22 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBH36MLK052556;
 Tue, 17 Dec 2013 03:06:22 GMT (envelope-from adrian@svn.freebsd.org)
Received: (from adrian@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBH36MtI052555;
 Tue, 17 Dec 2013 03:06:22 GMT (envelope-from adrian@svn.freebsd.org)
Message-Id: <201312170306.rBH36MtI052555@svn.freebsd.org>
From: Adrian Chadd <adrian@FreeBSD.org>
Date: Tue, 17 Dec 2013 03:06:22 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r259489 - head/sys/kern
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.17
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/options/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: Tue, 17 Dec 2013 03:06:22 -0000

Author: adrian
Date: Tue Dec 17 03:06:21 2013
New Revision: 259489
URL: http://svnweb.freebsd.org/changeset/base/259489

Log:
  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

Modified:
  head/sys/kern/uipc_syscalls.c

Modified: head/sys/kern/uipc_syscalls.c
==============================================================================
--- head/sys/kern/uipc_syscalls.c	Tue Dec 17 01:02:34 2013	(r259488)
+++ head/sys/kern/uipc_syscalls.c	Tue Dec 17 03:06:21 2013	(r259489)
@@ -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);
 }