Module Name: src
Committed By: christos
Date: Sun Oct 26 15:38:28 UTC 2014
Modified Files:
src/sys/arch/x86/x86: syscall.c
Log Message:
dtrace expects a globally accessible syscall symbol.
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/x86/x86/syscall.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/x86/x86/syscall.c
diff -u src/sys/arch/x86/x86/syscall.c:1.12 src/sys/arch/x86/x86/syscall.c:1.13
--- src/sys/arch/x86/x86/syscall.c:1.12 Wed Jun 26 13:18:52 2013
+++ src/sys/arch/x86/x86/syscall.c Sun Oct 26 11:38:28 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: syscall.c,v 1.12 2013/06/26 17:18:52 matt Exp $ */
+/* $NetBSD: syscall.c,v 1.13 2014/10/26 15:38:28 christos Exp $ */
/*-
* Copyright (c) 1998, 2000, 2009 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: syscall.c,v 1.12 2013/06/26 17:18:52 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: syscall.c,v 1.13 2014/10/26 15:38:28 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -47,6 +47,8 @@ __KERNEL_RCSID(0, "$NetBSD: syscall.c,v
#include <machine/psl.h>
#include <machine/userret.h>
+#include "opt_dtrace.h"
+
#ifndef __x86_64__
#include "opt_vm86.h"
#ifdef VM86
@@ -93,19 +95,17 @@ cpu_spawn_return(struct lwp *l)
userret(l);
}
-void
-syscall_intern(struct proc *p)
-{
-
- p->p_md.md_syscall = syscall;
-}
-
/*
* syscall(frame):
* System call request from POSIX system call gate interface to kernel.
* Like trap(), argument is call by reference.
*/
-static void
+#ifdef KDTRACE_HOOKS
+void syscall(struct trapframe *);
+#else
+static
+#endif
+void
syscall(struct trapframe *frame)
{
const struct sysent *callp;
@@ -184,6 +184,13 @@ syscall(struct trapframe *frame)
userret(l);
}
+void
+syscall_intern(struct proc *p)
+{
+
+ p->p_md.md_syscall = syscall;
+}
+
#ifdef VM86
void
