Date: Sun, 30 Oct 2011 02:19:39 +0000 (UTC) From: Marcel Moolenaar <marcel@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r226925 - in head/sys: amd64/amd64 i386/i386 kern Message-ID: <201110300219.p9U2Jd2q043468@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: marcel Date: Sun Oct 30 02:19:39 2011 New Revision: 226925 URL: http://svn.freebsd.org/changeset/base/226925 Log: Revert rev. 226893: subr_syscall.c is being included from C files and on amd64 with FREEBSD32 enabled, this means that systrace_probe_func gets defined twice. Modified: head/sys/amd64/amd64/trap.c head/sys/i386/i386/trap.c head/sys/kern/subr_syscall.c Modified: head/sys/amd64/amd64/trap.c ============================================================================== --- head/sys/amd64/amd64/trap.c Sun Oct 30 01:24:56 2011 (r226924) +++ head/sys/amd64/amd64/trap.c Sun Oct 30 02:19:39 2011 (r226925) @@ -104,6 +104,13 @@ dtrace_trap_func_t dtrace_trap_func; dtrace_doubletrap_func_t dtrace_doubletrap_func; /* + * This is a hook which is initialised by the systrace module + * when it is loaded. This keeps the DTrace syscall provider + * implementation opaque. + */ +systrace_probe_func_t systrace_probe_func; + +/* * These hooks are necessary for the pid, usdt and fasttrap providers. */ dtrace_fasttrap_probe_ptr_t dtrace_fasttrap_probe_ptr; Modified: head/sys/i386/i386/trap.c ============================================================================== --- head/sys/i386/i386/trap.c Sun Oct 30 01:24:56 2011 (r226924) +++ head/sys/i386/i386/trap.c Sun Oct 30 02:19:39 2011 (r226925) @@ -113,6 +113,13 @@ dtrace_trap_func_t dtrace_trap_func; dtrace_doubletrap_func_t dtrace_doubletrap_func; /* + * This is a hook which is initialised by the systrace module + * when it is loaded. This keeps the DTrace syscall provider + * implementation opaque. + */ +systrace_probe_func_t systrace_probe_func; + +/* * These hooks are necessary for the pid, usdt and fasttrap providers. */ dtrace_fasttrap_probe_ptr_t dtrace_fasttrap_probe_ptr; Modified: head/sys/kern/subr_syscall.c ============================================================================== --- head/sys/kern/subr_syscall.c Sun Oct 30 01:24:56 2011 (r226924) +++ head/sys/kern/subr_syscall.c Sun Oct 30 02:19:39 2011 (r226925) @@ -52,15 +52,6 @@ __FBSDID("$FreeBSD$"); #endif #include <security/audit/audit.h> -#ifdef KDTRACE_HOOKS -/* - * This is a hook which is initialised by the systrace module - * when it is loaded. This keeps the DTrace syscall provider - * implementation opaque. - */ -systrace_probe_func_t systrace_probe_func; -#endif - static inline int syscallenter(struct thread *td, struct syscall_args *sa) {
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201110300219.p9U2Jd2q043468>