From 125fbc64feab4966ef236ceb2b86aa7a61d5660d Mon Sep 17 00:00:00 2001
From: Nicolas Joly <njoly@NetBSD.org>
Date: Wed, 18 Jun 2008 22:58:21 +0000
Subject: [PATCH] linux32_sys_ptrace() fixes. - Add opt_ptrace.h include to
 activate syscall. - Convert to use sys_ptrace() instead of netbsd32_ptrace().
 - Do not use arch specific call for now.

---
 sys/compat/linux32/common/linux32_misc.c | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/sys/compat/linux32/common/linux32_misc.c b/sys/compat/linux32/common/linux32_misc.c
index 4e854c2b377..25269094e09 100644
--- a/sys/compat/linux32/common/linux32_misc.c
+++ b/sys/compat/linux32/common/linux32_misc.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: linux32_misc.c,v 1.10 2008/04/28 20:23:44 martin Exp $	*/
+/*	$NetBSD: linux32_misc.c,v 1.11 2008/06/16 19:57:43 christos Exp $	*/
 
 /*-
  * Copyright (c) 1995, 1998, 1999 The NetBSD Foundation, Inc.
@@ -32,7 +32,11 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux32_misc.c,v 1.10 2008/04/28 20:23:44 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux32_misc.c,v 1.11 2008/06/16 19:57:43 christos Exp $");
+
+#if defined(_KERNEL_OPT)
+#include "opt_ptrace.h"
+#endif
 
 #include <sys/param.h>
 #include <sys/proc.h>
@@ -85,7 +89,9 @@ linux32_sys_statfs(struct lwp *l, const struct linux32_sys_statfs_args *uap, reg
 	STATVFSBUF_PUT(sb);
 	return error;
 }
+
 extern const int linux_ptrace_request_map[];
+
 int
 linux32_sys_ptrace(struct lwp *l, const struct linux32_sys_ptrace_args *uap, register_t *retval)
 {
@@ -106,11 +112,11 @@ linux32_sys_ptrace(struct lwp *l, const struct linux32_sys_ptrace_args *uap, reg
 	request = SCARG(uap, request);
 	while (*ptr != -1)
 		if (*ptr++ == request) {
-			struct netbsd32_ptrace_args pta;
+			struct sys_ptrace_args pta;
 
 			SCARG(&pta, req) = *ptr;
 			SCARG(&pta, pid) = SCARG(uap, pid);
-			SCARG(&pta, addr) = (void *)SCARG(uap, addr);
+			SCARG(&pta, addr) = NETBSD32IPTR64(SCARG(uap, addr));
 			SCARG(&pta, data) = SCARG(uap, data);
 
 			/*
@@ -122,14 +128,14 @@ linux32_sys_ptrace(struct lwp *l, const struct linux32_sys_ptrace_args *uap, reg
 			if (request == LINUX_PTRACE_CONT && SCARG(uap, addr)==0)
 				SCARG(&pta, addr) = (void *) 1;
 
-			error = netbsd32_ptrace(l, &pta, retval);
+			error = sys_ptrace(l, &pta, retval);
 			if (error)
 				return error;
 			switch (request) {
 			case LINUX_PTRACE_PEEKTEXT:
 			case LINUX_PTRACE_PEEKDATA:
 				error = copyout (retval,
-				    (void *)SCARG(uap, data), 
+				    NETBSD32IPTR64(SCARG(uap, data)), 
 				    sizeof *retval);
 				*retval = SCARG(uap, data);
 				break;
@@ -141,9 +147,7 @@ linux32_sys_ptrace(struct lwp *l, const struct linux32_sys_ptrace_args *uap, reg
 		else
 			ptr++;
 
-#if 0
-	return LINUX_SYS_PTRACE_ARCH(l, uap, retval);
-#endif
+	return EIO;
 #else
 	return ENOSYS;
 #endif /* PTRACE || _LKM */
-- 
2.11.4.GIT