From owner-svn-src-stable@FreeBSD.ORG  Fri Nov 25 13:34:27 2011
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id A0AD51065676;
	Fri, 25 Nov 2011 13:34:27 +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 8F9728FC1B;
	Fri, 25 Nov 2011 13:34:27 +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 pAPDYRtM045354;
	Fri, 25 Nov 2011 13:34:27 GMT (envelope-from rstone@svn.freebsd.org)
Received: (from rstone@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id pAPDYR20045352;
	Fri, 25 Nov 2011 13:34:27 GMT (envelope-from rstone@svn.freebsd.org)
Message-Id: <201111251334.pAPDYR20045352@svn.freebsd.org>
From: Ryan Stone <rstone@FreeBSD.org>
Date: Fri, 25 Nov 2011 13:34:27 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r227971 - stable/9/sys/kern
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 25 Nov 2011 13:34:27 -0000

Author: rstone
Date: Fri Nov 25 13:34:27 2011
New Revision: 227971
URL: http://svn.freebsd.org/changeset/base/227971

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:
  stable/9/sys/kern/kern_ctf.c
Directory Properties:
  stable/9/sys/   (props changed)
  stable/9/sys/amd64/include/xen/   (props changed)
  stable/9/sys/boot/   (props changed)
  stable/9/sys/boot/i386/efi/   (props changed)
  stable/9/sys/boot/ia64/efi/   (props changed)
  stable/9/sys/boot/ia64/ski/   (props changed)
  stable/9/sys/boot/powerpc/boot1.chrp/   (props changed)
  stable/9/sys/boot/powerpc/ofw/   (props changed)
  stable/9/sys/cddl/contrib/opensolaris/   (props changed)
  stable/9/sys/conf/   (props changed)
  stable/9/sys/contrib/dev/acpica/   (props changed)
  stable/9/sys/contrib/octeon-sdk/   (props changed)
  stable/9/sys/contrib/pf/   (props changed)
  stable/9/sys/contrib/x86emu/   (props changed)

Modified: stable/9/sys/kern/kern_ctf.c
==============================================================================
--- stable/9/sys/kern/kern_ctf.c	Fri Nov 25 12:51:32 2011	(r227970)
+++ stable/9/sys/kern/kern_ctf.c	Fri Nov 25 13:34:27 2011	(r227971)
@@ -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) {