Author: markj
Date: Thu May 29 01:42:22 2014
New Revision: 266827
URL: http://svnweb.freebsd.org/changeset/base/266827
Log:
Commit the rest of the changes that were intended to be part of r266826.
X-MFC-with: r266826
Modified:
head/sys/amd64/amd64/trap.c
head/sys/i386/i386/trap.c
head/sys/kern/kern_dtrace.c
head/sys/mips/mips/trap.c
head/sys/powerpc/aim/trap.c
Modified: head/sys/amd64/amd64/trap.c
==============================================================================
--- head/sys/amd64/amd64/trap.c Thu May 29 01:41:19 2014 (r266826)
+++ head/sys/amd64/amd64/trap.c Thu May 29 01:42:22 2014 (r266827)
@@ -95,28 +95,6 @@ PMC_SOFT_DEFINE( , , page_fault, write);
#ifdef KDTRACE_HOOKS
#include <sys/dtrace_bsd.h>
-
-/*
- * This is a hook which is initialised by the dtrace module
- * to handle traps which might occur during DTrace probe
- * execution.
- */
-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 and usdt providers.
- */
-dtrace_pid_probe_ptr_t dtrace_pid_probe_ptr;
-dtrace_return_probe_ptr_t dtrace_return_probe_ptr;
#endif
extern void trap(struct trapframe *frame);
Modified: head/sys/i386/i386/trap.c
==============================================================================
--- head/sys/i386/i386/trap.c Thu May 29 01:41:19 2014 (r266826)
+++ head/sys/i386/i386/trap.c Thu May 29 01:42:22 2014 (r266827)
@@ -104,28 +104,6 @@ PMC_SOFT_DEFINE( , , page_fault, write);
#ifdef KDTRACE_HOOKS
#include <sys/dtrace_bsd.h>
-
-/*
- * This is a hook which is initialised by the dtrace module
- * to handle traps which might occur during DTrace probe
- * execution.
- */
-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 and usdt providers.
- */
-dtrace_pid_probe_ptr_t dtrace_pid_probe_ptr;
-dtrace_return_probe_ptr_t dtrace_return_probe_ptr;
#endif
extern void trap(struct trapframe *frame);
Modified: head/sys/kern/kern_dtrace.c
==============================================================================
--- head/sys/kern/kern_dtrace.c Thu May 29 01:41:19 2014 (r266826)
+++ head/sys/kern/kern_dtrace.c Thu May 29 01:42:22 2014 (r266827)
@@ -38,6 +38,7 @@ __FBSDID("$FreeBSD$");
#include <sys/proc.h>
#include <sys/dtrace_bsd.h>
#include <sys/sysctl.h>
+#include <sys/sysent.h>
#define KDTRACE_PROC_SIZE 64
#define KDTRACE_THREAD_SIZE 256
@@ -47,6 +48,14 @@ FEATURE(kdtrace_hooks,
static MALLOC_DEFINE(M_KDTRACE, "kdtrace", "DTrace hooks");
+/* Hooks used in the machine-dependent trap handlers. */
+dtrace_trap_func_t dtrace_trap_func;
+dtrace_doubletrap_func_t dtrace_doubletrap_func;
+dtrace_pid_probe_ptr_t dtrace_pid_probe_ptr;
+dtrace_return_probe_ptr_t dtrace_return_probe_ptr;
+
+systrace_probe_func_t systrace_probe_func;
+
/* Return the DTrace process data size compiled in the kernel hooks. */
size_t
kdtrace_proc_size()
Modified: head/sys/mips/mips/trap.c
==============================================================================
--- head/sys/mips/mips/trap.c Thu May 29 01:41:19 2014 (r266826)
+++ head/sys/mips/mips/trap.c Thu May 29 01:42:22 2014 (r266827)
@@ -93,28 +93,6 @@ __FBSDID("$FreeBSD$");
#ifdef KDTRACE_HOOKS
#include <sys/dtrace_bsd.h>
-
-/*
- * This is a hook which is initialised by the dtrace module
- * to handle traps which might occur during DTrace probe
- * execution.
- */
-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 and usdt providers.
- */
-dtrace_pid_probe_ptr_t dtrace_pid_probe_ptr;
-dtrace_return_probe_ptr_t dtrace_return_probe_ptr;
#endif
#ifdef TRAP_DEBUG
Modified: head/sys/powerpc/aim/trap.c
==============================================================================
--- head/sys/powerpc/aim/trap.c Thu May 29 01:41:19 2014 (r266826)
+++ head/sys/powerpc/aim/trap.c Thu May 29 01:42:22 2014 (r266827)
@@ -95,27 +95,6 @@ struct powerpc_exception {
#ifdef KDTRACE_HOOKS
#include <sys/dtrace_bsd.h>
-/*
- * This is a hook which is initialised by the dtrace module
- * to handle traps which might occur during DTrace probe
- * execution.
- */
-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 and usdt providers.
- */
-dtrace_pid_probe_ptr_t dtrace_pid_probe_ptr;
-dtrace_return_probe_ptr_t dtrace_return_probe_ptr;
int (*dtrace_invop_jump_addr)(struct trapframe *);
#endif
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
