From owner-cvs-src@FreeBSD.ORG  Wed Nov 16 08:11:08 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 8439616A41F;
	Wed, 16 Nov 2005 08:11:08 +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 5907C43D49;
	Wed, 16 Nov 2005 08:11:08 +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 jAG8B8uA046599;
	Wed, 16 Nov 2005 08:11:08 GMT
	(envelope-from rwatson@repoman.freebsd.org)
Received: (from rwatson@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jAG8B8sY046597;
	Wed, 16 Nov 2005 08:11:08 GMT (envelope-from rwatson)
Message-Id: <200511160811.jAG8B8sY046597@repoman.freebsd.org>
From: Robert Watson <rwatson@FreeBSD.org>
Date: Wed, 16 Nov 2005 08:11:06 +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/sys ktrace.h src/sys/kern kern_ktrace.c
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: Wed, 16 Nov 2005 08:11:08 -0000

rwatson     2005-11-16 08:11:06 UTC

  FreeBSD src repository

  Modified files:        (Branch: RELENG_6)
    sys/sys              ktrace.h 
    sys/kern             kern_ktrace.c 
  Log:
  Merge kern_ktrace.c:1.102, ktrace.h:1.30 from HEAD to RELENG_6:
  
    Replace ktr_buffer pointer in struct ktr_header with a ktr_unused
    intptr_t.  The buffer length needs to be written to disk as part
    of the trace log, but the kernel pointer for the buffer does not.
    Add a new ktr_buffer pointer to the kernel-only ktrace request
    structure to hold that pointer.  This frees up an integer in the
    ktrace record format that can be used to hold the threadid,
    although older ktrace files will have a garbage ktr_buffer field
    (or more accurately, a kernel pointer value).
  
    Space requested by:     davidxu
  
  Revision   Changes    Path
  1.101.2.1  +11 -9     src/sys/kern/kern_ktrace.c
  1.29.2.1   +1 -1      src/sys/sys/ktrace.h