Module Name: src
Committed By: njoly
Date: Fri Jul 22 10:02:08 UTC 2011
Modified Files:
src/sys/compat/osf1: osf1_file.c osf1_ioctl.c osf1_misc.c
Log Message:
Fix SYSCALL_DEBUG build.
To generate a diff of this commit:
cvs rdiff -u -r1.40 -r1.41 src/sys/compat/osf1/osf1_file.c
cvs rdiff -u -r1.22 -r1.23 src/sys/compat/osf1/osf1_ioctl.c
cvs rdiff -u -r1.85 -r1.86 src/sys/compat/osf1/osf1_misc.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/compat/osf1/osf1_file.c
diff -u src/sys/compat/osf1/osf1_file.c:1.40 src/sys/compat/osf1/osf1_file.c:1.41
--- src/sys/compat/osf1/osf1_file.c:1.40 Thu Jun 24 13:03:07 2010
+++ src/sys/compat/osf1/osf1_file.c Fri Jul 22 10:02:08 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: osf1_file.c,v 1.40 2010/06/24 13:03:07 hannken Exp $ */
+/* $NetBSD: osf1_file.c,v 1.41 2011/07/22 10:02:08 njoly Exp $ */
/*
* Copyright (c) 1999 Christopher G. Demetriou. All rights reserved.
@@ -58,7 +58,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: osf1_file.c,v 1.40 2010/06/24 13:03:07 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: osf1_file.c,v 1.41 2011/07/22 10:02:08 njoly Exp $");
#if defined(_KERNEL_OPT)
#include "opt_syscall_debug.h"
@@ -94,6 +94,10 @@
#include <compat/osf1/osf1_cvt.h>
#include <compat/osf1/osf1_dirent.h>
+#ifdef SYSCALL_DEBUG
+extern int scdebug;
+#endif
+
int
osf1_sys_access(struct lwp *l, const struct osf1_sys_access_args *uap, register_t *retval)
{
Index: src/sys/compat/osf1/osf1_ioctl.c
diff -u src/sys/compat/osf1/osf1_ioctl.c:1.22 src/sys/compat/osf1/osf1_ioctl.c:1.23
--- src/sys/compat/osf1/osf1_ioctl.c:1.22 Thu Dec 20 23:03:03 2007
+++ src/sys/compat/osf1/osf1_ioctl.c Fri Jul 22 10:02:08 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: osf1_ioctl.c,v 1.22 2007/12/20 23:03:03 dsl Exp $ */
+/* $NetBSD: osf1_ioctl.c,v 1.23 2011/07/22 10:02:08 njoly Exp $ */
/*
* Copyright (c) 1999 Christopher G. Demetriou. All rights reserved.
@@ -58,7 +58,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: osf1_ioctl.c,v 1.22 2007/12/20 23:03:03 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: osf1_ioctl.c,v 1.23 2011/07/22 10:02:08 njoly Exp $");
#if defined(_KERNEL_OPT)
#include "opt_compat_43.h"
@@ -92,7 +92,7 @@
struct sys_ioctl_args a;
int op, dir, group, cmd, len;
#ifdef SYSCALL_DEBUG
- char *dirstr;
+ const char *dirstr;
#endif
op = SCARG(uap, com);
Index: src/sys/compat/osf1/osf1_misc.c
diff -u src/sys/compat/osf1/osf1_misc.c:1.85 src/sys/compat/osf1/osf1_misc.c:1.86
--- src/sys/compat/osf1/osf1_misc.c:1.85 Fri Apr 23 15:19:20 2010
+++ src/sys/compat/osf1/osf1_misc.c Fri Jul 22 10:02:08 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: osf1_misc.c,v 1.85 2010/04/23 15:19:20 rmind Exp $ */
+/* $NetBSD: osf1_misc.c,v 1.86 2011/07/22 10:02:08 njoly Exp $ */
/*
* Copyright (c) 1999 Christopher G. Demetriou. All rights reserved.
@@ -58,7 +58,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: osf1_misc.c,v 1.85 2010/04/23 15:19:20 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: osf1_misc.c,v 1.86 2011/07/22 10:02:08 njoly Exp $");
#if defined(_KERNEL_OPT)
#include "opt_syscall_debug.h"
@@ -95,10 +95,6 @@
#include <compat/common/compat_util.h>
#include <compat/osf1/osf1_cvt.h>
-#ifdef SYSCALL_DEBUG
-extern int scdebug;
-#endif
-
int
osf1_sys_classcntl(struct lwp *l, const struct osf1_sys_classcntl_args *uap, register_t *retval)
{