From owner-p4-projects@FreeBSD.ORG  Fri Jul  7 18:46:44 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 359C216A4E1; Fri,  7 Jul 2006 18:46:44 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 0C52916A4DA
	for <perforce@freebsd.org>; Fri,  7 Jul 2006 18:46:44 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 8CE4043D45
	for <perforce@freebsd.org>; Fri,  7 Jul 2006 18:46:43 +0000 (GMT)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k67IkhK9060006
	for <perforce@freebsd.org>; Fri, 7 Jul 2006 18:46:43 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k67Ikhkh060003
	for perforce@freebsd.org; Fri, 7 Jul 2006 18:46:43 GMT
	(envelope-from jb@freebsd.org)
Date: Fri, 7 Jul 2006 18:46:43 GMT
Message-Id: <200607071846.k67Ikhkh060003@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jb@freebsd.org using -f
From: John Birrell <jb@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 100913 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 07 Jul 2006 18:46:44 -0000

http://perforce.freebsd.org/chv.cgi?CH=100913

Change 100913 by jb@jb_freebsd2 on 2006/07/07 18:46:22

	Use u_long arg to ioctl to avoid sign-extension on 64-bit architectures.

Affected files ...

.. //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_impl.h#10 edit
.. //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dtrace.h#2 edit

Differences ...

==== //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_impl.h#10 (text) ====

@@ -560,7 +560,11 @@
 extern void dt_set_errmsg(dtrace_hdl_t *, const char *, const char *,
     const char *, int, const char *, va_list);
 
+#if defined(sun)
 extern int dt_ioctl(dtrace_hdl_t *, int, void *);
+#else
+extern int dt_ioctl(dtrace_hdl_t *, u_long, void *);
+#endif
 extern int dt_status(dtrace_hdl_t *, processorid_t);
 extern long dt_sysconf(dtrace_hdl_t *, int);
 extern ssize_t dt_write(dtrace_hdl_t *, int, const void *, size_t);

==== //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dtrace.h#2 (text) ====

@@ -521,7 +521,11 @@
  * entry point to obtain a library handle.
  */
 struct dtrace_vector {
+#if defined(sun)
 	int (*dtv_ioctl)(void *, int, void *);
+#else
+	int (*dtv_ioctl)(void *, u_long, void *);
+#endif
 	int (*dtv_lookup_by_addr)(void *, GElf_Addr, GElf_Sym *,
 	    dtrace_syminfo_t *);
 	int (*dtv_status)(void *, processorid_t);