From owner-svn-src-head@FreeBSD.ORG  Sun Nov 30 21:59:44 2008
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 9BA601065672;
	Sun, 30 Nov 2008 21:59:44 +0000 (UTC) (envelope-from sam@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 8A8018FC17;
	Sun, 30 Nov 2008 21:59:44 +0000 (UTC) (envelope-from sam@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id mAULxiS3003134;
	Sun, 30 Nov 2008 21:59:44 GMT (envelope-from sam@svn.freebsd.org)
Received: (from sam@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id mAULxilH003133;
	Sun, 30 Nov 2008 21:59:44 GMT (envelope-from sam@svn.freebsd.org)
Message-Id: <200811302159.mAULxilH003133@svn.freebsd.org>
From: Sam Leffler <sam@FreeBSD.org>
Date: Sun, 30 Nov 2008 21:59:44 +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: r185490 - head/sys/dev/ath/ath_rate/sample
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 30 Nov 2008 21:59:44 -0000

Author: sam
Date: Sun Nov 30 21:59:44 2008
New Revision: 185490
URL: http://svn.freebsd.org/changeset/base/185490

Log:
  cover up sun4v namespace pollution

Modified:
  head/sys/dev/ath/ath_rate/sample/sample.c

Modified: head/sys/dev/ath/ath_rate/sample/sample.c
==============================================================================
--- head/sys/dev/ath/ath_rate/sample/sample.c	Sun Nov 30 21:40:01 2008	(r185489)
+++ head/sys/dev/ath/ath_rate/sample/sample.c	Sun Nov 30 21:59:44 2008	(r185490)
@@ -405,6 +405,9 @@ static const struct txschedule series_ha
 };
 #undef H
 
+#ifdef Q
+#undef Q		/* sun4v bogosity */
+#endif
 #define Q(_r) \
     (((_r) == 1.5) ? 0 : (((_r) ==2.25) ? 1 : (((_r) == 3)  ? 2 : \
     (((_r) == 4.5) ? 3 : (((_r) ==  6)  ? 4 : (((_r) == 9)  ? 5 : \