From owner-svn-src-head@FreeBSD.ORG Sun Oct 30 02:19:39 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 94D011065670; Sun, 30 Oct 2011 02:19:39 +0000 (UTC) (envelope-from marcel@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 6ACBD8FC13; Sun, 30 Oct 2011 02:19:39 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p9U2Jd1W043472; Sun, 30 Oct 2011 02:19:39 GMT (envelope-from marcel@svn.freebsd.org) Received: (from marcel@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p9U2Jd2q043468; Sun, 30 Oct 2011 02:19:39 GMT (envelope-from marcel@svn.freebsd.org) Message-Id: <201110300219.p9U2Jd2q043468@svn.freebsd.org> From: Marcel Moolenaar Date: Sun, 30 Oct 2011 02:19:39 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r226925 - in head/sys: amd64/amd64 i386/i386 kern X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 30 Oct 2011 02:19:39 -0000 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 -#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) {