From owner-svn-src-all@FreeBSD.ORG  Tue Feb  9 17:20:00 2010
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 652AD106568D;
	Tue,  9 Feb 2010 17:20:00 +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 54C1C8FC24;
	Tue,  9 Feb 2010 17:20:00 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o19HK0bE031208;
	Tue, 9 Feb 2010 17:20:00 GMT (envelope-from marcel@svn.freebsd.org)
Received: (from marcel@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o19HK0F7031206;
	Tue, 9 Feb 2010 17:20:00 GMT (envelope-from marcel@svn.freebsd.org)
Message-Id: <201002091720.o19HK0F7031206@svn.freebsd.org>
From: Marcel Moolenaar <marcel@FreeBSD.org>
Date: Tue, 9 Feb 2010 17:20:00 +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: r203708 - head/sys/kern
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 09 Feb 2010 17:20:00 -0000

Author: marcel
Date: Tue Feb  9 17:20:00 2010
New Revision: 203708
URL: http://svn.freebsd.org/changeset/base/203708

Log:
  Unbreak building kernels with COMPAT_32 enabled. The actual support
  for the PT_VM_ENTRY request from 32-bit processes will follow.
  
  Pointy hat: marcel

Modified:
  head/sys/kern/sys_process.c

Modified: head/sys/kern/sys_process.c
==============================================================================
--- head/sys/kern/sys_process.c	Tue Feb  9 17:16:13 2010	(r203707)
+++ head/sys/kern/sys_process.c	Tue Feb  9 17:20:00 2010	(r203708)
@@ -73,6 +73,17 @@ struct ptrace_io_desc32 {
 	u_int32_t	piod_addr;
 	u_int32_t	piod_len;
 };
+
+struct ptrace_vm_entry32 {
+	uint32_t	pve_cookie;
+	uint32_t	pve_start;
+	uint32_t	pve_end;
+	uint32_t	pve_offset;
+	u_int		pve_prot;
+	u_int		pve_pathlen;
+	uint32_t	pve_path;
+};
+
 #endif
 
 /*
@@ -484,6 +495,7 @@ ptrace(struct thread *td, struct ptrace_
 		struct fpreg32 fpreg32;
 		struct reg32 reg32;
 		struct ptrace_io_desc32 piod32;
+		struct ptrace_vm_entry32 pve32;
 #endif
 	} r;
 	void *addr;
@@ -1075,6 +1087,13 @@ kern_ptrace(struct thread *td, int req, 
 		break;
 
 	case PT_VM_ENTRY:
+#ifdef COMPAT_IA32
+		/* XXX to be implemented. */
+		if (wrap32) {
+			error = EDOOFUS;
+			break;
+		}
+#endif
 		PROC_UNLOCK(p);
 		error = ptrace_vm_entry(td, p, addr);
 		PROC_LOCK(p);