From owner-svn-src-all@FreeBSD.ORG  Fri Nov 25 12:43:34 2011
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id A8B7B106566B;
	Fri, 25 Nov 2011 12:43:34 +0000 (UTC)
	(envelope-from rstone@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 97FF58FC08;
	Fri, 25 Nov 2011 12:43:34 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id pAPChY5I043744;
	Fri, 25 Nov 2011 12:43:34 GMT (envelope-from rstone@svn.freebsd.org)
Received: (from rstone@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id pAPChY3O043742;
	Fri, 25 Nov 2011 12:43:34 GMT (envelope-from rstone@svn.freebsd.org)
Message-Id: <201111251243.pAPChY3O043742@svn.freebsd.org>
From: Ryan Stone <rstone@FreeBSD.org>
Date: Fri, 25 Nov 2011 12:43:34 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-releng@freebsd.org
X-SVN-Group: releng
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r227969 - releng/9.0/sys/kern
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
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/listinfo/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: Fri, 25 Nov 2011 12:43:34 -0000

Author: rstone
Date: Fri Nov 25 12:43:34 2011
New Revision: 227969
URL: http://svn.freebsd.org/changeset/base/227969

Log:
  MFC r227342.  Note that the original commit message, reproduced below, has
  error.  The final sentence should read "*without* CTF data".
  
   The in-kernel CTF parser caches the result of its first attempt to parse
   CTF data from a module.  On subsequent attempts to retrieve CTF data for
   a module, return an error if there no CTF data.
  
   This fixes a panic if you try to enable fbt probes on a module with CTF
   data twice.
  
  Approved by:	re (kib)

Modified:
  releng/9.0/sys/kern/kern_ctf.c
Directory Properties:
  releng/9.0/sys/   (props changed)
  releng/9.0/sys/amd64/include/xen/   (props changed)
  releng/9.0/sys/boot/   (props changed)
  releng/9.0/sys/boot/i386/efi/   (props changed)
  releng/9.0/sys/boot/ia64/efi/   (props changed)
  releng/9.0/sys/boot/ia64/ski/   (props changed)
  releng/9.0/sys/boot/powerpc/boot1.chrp/   (props changed)
  releng/9.0/sys/boot/powerpc/ofw/   (props changed)
  releng/9.0/sys/cddl/contrib/opensolaris/   (props changed)
  releng/9.0/sys/conf/   (props changed)
  releng/9.0/sys/contrib/dev/acpica/   (props changed)
  releng/9.0/sys/contrib/octeon-sdk/   (props changed)
  releng/9.0/sys/contrib/pf/   (props changed)
  releng/9.0/sys/contrib/x86emu/   (props changed)

Modified: releng/9.0/sys/kern/kern_ctf.c
==============================================================================
--- releng/9.0/sys/kern/kern_ctf.c	Fri Nov 25 12:20:14 2011	(r227968)
+++ releng/9.0/sys/kern/kern_ctf.c	Fri Nov 25 12:43:34 2011	(r227969)
@@ -90,7 +90,7 @@ link_elf_ctf_get(linker_file_t lf, linke
 	 * ctfcnt to -1. See below.
 	 */
 	if (ef->ctfcnt < 0)
-		return (0);
+		return (EFTYPE);
 
 	/* Now check if we've already loaded the CTF data.. */
 	if (ef->ctfcnt > 0) {