Date: Sat, 29 Oct 2011 01:26:36 +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: r226893 - in head/sys: amd64/amd64 i386/i386 kern Message-ID: <201110290126.p9T1Qaoi087060@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: marcel Date: Sat Oct 29 01:26:36 2011 New Revision: 226893 URL: http://svn.freebsd.org/changeset/base/226893 Log: Define systrace_probe_func in subr_syscall.c where it's used, instead of defining it in MD code. This eliminates porting to other architectures. 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 Fri Oct 28 23:02:21 2011 (r226892) +++ head/sys/amd64/amd64/trap.c Sat Oct 29 01:26:36 2011 (r226893) @@ -104,13 +104,6 @@ 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 Fri Oct 28 23:02:21 2011 (r226892) +++ head/sys/i386/i386/trap.c Sat Oct 29 01:26:36 2011 (r226893) @@ -113,13 +113,6 @@ 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 Fri Oct 28 23:02:21 2011 (r226892) +++ head/sys/kern/subr_syscall.c Sat Oct 29 01:26:36 2011 (r226893) @@ -52,6 +52,15 @@ __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?201110290126.p9T1Qaoi087060>