From owner-svn-src-projects@FreeBSD.ORG  Mon Mar 19 18:41:44 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 8D305106566B;
	Mon, 19 Mar 2012 18:41:44 +0000 (UTC)
	(envelope-from ambrisko@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 785B18FC14;
	Mon, 19 Mar 2012 18:41:44 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q2JIfiW3080992;
	Mon, 19 Mar 2012 18:41:44 GMT
	(envelope-from ambrisko@svn.freebsd.org)
Received: (from ambrisko@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q2JIfinF080990;
	Mon, 19 Mar 2012 18:41:44 GMT
	(envelope-from ambrisko@svn.freebsd.org)
Message-Id: <201203191841.q2JIfinF080990@svn.freebsd.org>
From: Doug Ambrisko <ambrisko@FreeBSD.org>
Date: Mon, 19 Mar 2012 18:41:44 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r233189 - projects/head_mfi/sys/dev/mfi
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 19 Mar 2012 18:41:44 -0000

Author: ambrisko
Date: Mon Mar 19 18:41:43 2012
New Revision: 233189
URL: http://svn.freebsd.org/changeset/base/233189

Log:
  Update the pivot to >= 900000 to deal with the change in API for
  FreeBSD 9 and -current.
  
  Reviewed by:		sbruno

Modified:
  projects/head_mfi/sys/dev/mfi/mfi_linux.c

Modified: projects/head_mfi/sys/dev/mfi/mfi_linux.c
==============================================================================
--- projects/head_mfi/sys/dev/mfi/mfi_linux.c	Mon Mar 19 18:03:20 2012	(r233188)
+++ projects/head_mfi/sys/dev/mfi/mfi_linux.c	Mon Mar 19 18:41:43 2012	(r233189)
@@ -29,7 +29,7 @@ __FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#if __FreeBSD_version > 999999
+#if __FreeBSD_version >= 900000
 #include <sys/capability.h>
 #endif
 #include <sys/conf.h>
@@ -99,7 +99,7 @@ mfi_linux_ioctl(struct thread *p, struct
 		break;
 	}
 
-#if __FreeBSD_version > 999999
+#if __FreeBSD_version >= 900000
 	if ((error = fget(p, args->fd, CAP_IOCTL, &fp)) != 0)
 #else
 	if ((error = fget(p, args->fd, &fp)) != 0)