From owner-svn-src-all@FreeBSD.ORG  Mon Feb  4 21:50:56 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])
 by hub.freebsd.org (Postfix) with ESMTP id 262C1B9C;
 Mon,  4 Feb 2013 21:50:56 +0000 (UTC) (envelope-from avg@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 14AE5250;
 Mon,  4 Feb 2013 21:50:56 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r14LotLN003094;
 Mon, 4 Feb 2013 21:50:55 GMT (envelope-from avg@svn.freebsd.org)
Received: (from avg@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r14Lot9x003093;
 Mon, 4 Feb 2013 21:50:55 GMT (envelope-from avg@svn.freebsd.org)
Message-Id: <201302042150.r14Lot9x003093@svn.freebsd.org>
From: Andriy Gapon <avg@FreeBSD.org>
Date: Mon, 4 Feb 2013 21:50:55 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r246330 - 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.14
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: Mon, 04 Feb 2013 21:50:56 -0000

Author: avg
Date: Mon Feb  4 21:50:55 2013
New Revision: 246330
URL: http://svnweb.freebsd.org/changeset/base/246330

Log:
  ktr: copy content from the early static buffer if KTR_ENTRIES !=
  KTR_BOOT_ENTRIES
  
  Reported by:	glebius, jhb
  Pointyhat to:	avg
  MFC after:	14 days
  X-MFC with:	r246282

Modified:
  head/sys/kern/kern_ktr.c

Modified: head/sys/kern/kern_ktr.c
==============================================================================
--- head/sys/kern/kern_ktr.c	Mon Feb  4 19:17:15 2013	(r246329)
+++ head/sys/kern/kern_ktr.c	Mon Feb  4 21:50:55 2013	(r246330)
@@ -213,6 +213,7 @@ ktr_entries_initializer(void *dummy __un
 	ktr_mask = 0;
 	ktr_buf = malloc(sizeof(*ktr_buf) * KTR_ENTRIES, M_KTR,
 	    M_WAITOK | M_ZERO);
+	memcpy(ktr_buf, ktr_buf_init, sizeof(ktr_buf_init));
 	ktr_entries = KTR_ENTRIES;
 	ktr_mask = mask;
 }