From owner-cvs-src@FreeBSD.ORG  Mon Jul 25 00:08:13 2005
Return-Path: <owner-cvs-src@FreeBSD.ORG>
X-Original-To: cvs-src@FreeBSD.org
Delivered-To: cvs-src@FreeBSD.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 2CC7216A41F;
	Mon, 25 Jul 2005 00:08:13 +0000 (GMT)
	(envelope-from rwatson@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 0370943D48;
	Mon, 25 Jul 2005 00:08:13 +0000 (GMT)
	(envelope-from rwatson@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j6P08Cro056236;
	Mon, 25 Jul 2005 00:08:12 GMT
	(envelope-from rwatson@repoman.freebsd.org)
Received: (from rwatson@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j6P08CLl056235;
	Mon, 25 Jul 2005 00:08:12 GMT (envelope-from rwatson)
Message-Id: <200507250008.j6P08CLl056235@repoman.freebsd.org>
From: Robert Watson <rwatson@FreeBSD.org>
Date: Mon, 25 Jul 2005 00:08:12 +0000 (UTC)
To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: RELENG_6
Cc: 
Subject: cvs commit: src/sys/kern kern_mbuf.c uipc_mbuf2.c src/sys/sys mbuf.h
X-BeenThere: cvs-src@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit messages for the src tree <cvs-src.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-src>
List-Post: <mailto:cvs-src@freebsd.org>
List-Help: <mailto:cvs-src-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 25 Jul 2005 00:08:13 -0000

rwatson     2005-07-25 00:08:12 UTC

  FreeBSD src repository

  Modified files:        (Branch: RELENG_6)
    sys/kern             kern_mbuf.c uipc_mbuf2.c 
    sys/sys              mbuf.h 
  Log:
  Merge kern_mbuf.c:1.10, uipc_mbuf.c:1.32, mbuf.h:1.171 from HEAD to
  RELENG_6:
  
    Define four constants, MBUF_{,MEM,CLUSTER,PACKET,TAG}_MEM_NAME, which
    are string names for their respective UMA zones and malloc types, and
    are passed into uma_zcreate() and MALLOC_DEFINE().  Export them
    outside of _KERNEL in mbuf.h so that netstat can reference them.
  
    Change the names to improve consistency, with each zone/type
    associated with the mbuf allocator being prefixed mbuf_.
  
  Approved by:    re (kensmith)
  
  Revision   Changes    Path
  1.9.2.1    +6 -4      src/sys/kern/kern_mbuf.c
  1.31.2.1   +2 -1      src/sys/kern/uipc_mbuf2.c
  1.170.2.1  +10 -0     src/sys/sys/mbuf.h