From owner-svn-src-all@freebsd.org  Tue Apr 12 17:44:36 2016
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 15D0DB0D3FB;
 Tue, 12 Apr 2016 17:44:36 +0000 (UTC) (envelope-from jhb@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id DA77D1CEE;
 Tue, 12 Apr 2016 17:44:35 +0000 (UTC) (envelope-from jhb@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u3CHiZ40081528;
 Tue, 12 Apr 2016 17:44:35 GMT (envelope-from jhb@FreeBSD.org)
Received: (from jhb@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u3CHiZgY081527;
 Tue, 12 Apr 2016 17:44:35 GMT (envelope-from jhb@FreeBSD.org)
Message-Id: <201604121744.u3CHiZgY081527@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: jhb set sender to jhb@FreeBSD.org
 using -f
From: John Baldwin <jhb@FreeBSD.org>
Date: Tue, 12 Apr 2016 17:44:35 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r297863 - head/sys/dev/cxgbe/common
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.21
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: <https://lists.freebsd.org/mailman/options/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: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 12 Apr 2016 17:44:36 -0000

Author: jhb
Date: Tue Apr 12 17:44:34 2016
New Revision: 297863
URL: https://svnweb.freebsd.org/changeset/base/297863

Log:
  Rename the 'M_B' macro in t4_regs.h to 'CXGBE_M_B'.
  
  This fixes a conflict with the M_B macro in powerpc's
  <machine/db_machdep.h> exposed by the recent addition of DDB commands
  to the cxgbe driver.
  
  Discussed with:	np
  Reported by:	bz
  Sponsored by:	Chelsio Communications

Modified:
  head/sys/dev/cxgbe/common/t4_regs.h

Modified: head/sys/dev/cxgbe/common/t4_regs.h
==============================================================================
--- head/sys/dev/cxgbe/common/t4_regs.h	Tue Apr 12 17:23:03 2016	(r297862)
+++ head/sys/dev/cxgbe/common/t4_regs.h	Tue Apr 12 17:44:34 2016	(r297863)
@@ -47301,9 +47301,9 @@
 #define A_MAC_PORT_PTP_OFFSET_ADJUST_FINE 0x9a4
 
 #define S_B    16
-#define M_B    0xffffU
+#define CXGBE_M_B    0xffffU
 #define V_B(x) ((x) << S_B)
-#define G_B(x) (((x) >> S_B) & M_B)
+#define G_B(x) (((x) >> S_B) & CXGBE_M_B)
 
 #define S_A    0
 #define M_A    0xffffU