svn commit: r227971 - stable/9/sys/kern
Ryan Stone
rstone at FreeBSD.org
Fri Nov 25 13:34:27 UTC 2011
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) {
More information about the svn-src-stable-9
mailing list