Date: Tue, 12 Apr 2016 17:44:35 +0000 (UTC) From: John Baldwin <jhb@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r297863 - head/sys/dev/cxgbe/common Message-ID: <201604121744.u3CHiZgY081527@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201604121744.u3CHiZgY081527>