Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 17 Dec 2013 03:06:22 +0000 (UTC)
From:      Adrian Chadd <adrian@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r259489 - head/sys/kern
Message-ID:  <201312170306.rBH36MtI052555@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
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);
 }



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201312170306.rBH36MtI052555>