d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert rev. 226893: subr_syscall.c is being included from C files and

Browse Source 
on amd64 with FREEBSD32 enabled, this means that systrace_probe_func
gets defined twice.
This commit is contained in:
Marcel Moolenaar 2011-10-30 02:19:39 +00:00
parent 041a3f80fc
commit b2f1a8f2b3
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=226925
3 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sys/amd64/amd64/trap.c
View File

@ -103,6 +103,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.
*/

7
sys/i386/i386/trap.c
View File

@ -112,6 +112,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.
*/

9
sys/kern/subr_syscall.c
View File

@ -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)
{