From owner-svn-src-all@FreeBSD.ORG  Sun Aug 22 10:13:57 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 441681065696;
	Sun, 22 Aug 2010 10:13:57 +0000 (UTC)
	(envelope-from rpaulo@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 3360D8FC1D;
	Sun, 22 Aug 2010 10:13:57 +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 o7MADvLL098172;
	Sun, 22 Aug 2010 10:13:57 GMT (envelope-from rpaulo@svn.freebsd.org)
Received: (from rpaulo@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o7MADvoc098170;
	Sun, 22 Aug 2010 10:13:57 GMT (envelope-from rpaulo@svn.freebsd.org)
Message-Id: <201008221013.o7MADvoc098170@svn.freebsd.org>
From: Rui Paulo <rpaulo@FreeBSD.org>
Date: Sun, 22 Aug 2010 10:13:57 +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: r211606 -
	head/sys/cddl/contrib/opensolaris/uts/common/sys
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: Sun, 22 Aug 2010 10:13:57 -0000

Author: rpaulo
Date: Sun Aug 22 10:13:56 2010
New Revision: 211606
URL: http://svn.freebsd.org/changeset/base/211606

Log:
  Add the FreeBSD definition for the fasttrap ioctls.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  head/sys/cddl/contrib/opensolaris/uts/common/sys/fasttrap.h

Modified: head/sys/cddl/contrib/opensolaris/uts/common/sys/fasttrap.h
==============================================================================
--- head/sys/cddl/contrib/opensolaris/uts/common/sys/fasttrap.h	Sun Aug 22 09:06:55 2010	(r211605)
+++ head/sys/cddl/contrib/opensolaris/uts/common/sys/fasttrap.h	Sun Aug 22 10:13:56 2010	(r211606)
@@ -37,9 +37,14 @@
 extern "C" {
 #endif
 
+#if defined(sun)
 #define	FASTTRAPIOC		(('m' << 24) | ('r' << 16) | ('f' << 8))
 #define	FASTTRAPIOC_MAKEPROBE	(FASTTRAPIOC | 1)
 #define	FASTTRAPIOC_GETINSTR	(FASTTRAPIOC | 2)
+#else
+#define	FASTTRAPIOC_MAKEPROBE	_IOW('f', 1, fasttrap_probe_spec_t)
+#define	FASTTRAPIOC_GETINSTR	_IOWR('f', 2, uint8_t)
+#endif
 
 typedef enum fasttrap_probe_type {
 	DTFTP_NONE = 0,