Date: Wed, 13 Jun 2018 16:47:30 -0700 From: Ryan Libby <rlibby@freebsd.org> To: Matt Macy <mmacy@freebsd.org> Cc: src-committers <src-committers@freebsd.org>, svn-src-all@freebsd.org, svn-src-head@freebsd.org, bde@freebsd.org Subject: Re: svn commit: r335094 - head/sys/ofed/drivers/infiniband/core Message-ID: <CAHgpiFwQza_CEeu687s-HwnHPT%2BfcPk80nHkbU3Kn-aUM2AjHQ@mail.gmail.com> In-Reply-To: <201806132330.w5DNUsrE043573@repo.freebsd.org> References: <201806132330.w5DNUsrE043573@repo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On Wed, Jun 13, 2018 at 4:30 PM, Matt Macy <mmacy@freebsd.org> wrote: > Author: mmacy > Date: Wed Jun 13 23:30:54 2018 > New Revision: 335094 > URL: https://svnweb.freebsd.org/changeset/base/335094 > > Log: > fix OFED build after r335053 > > Modified: > head/sys/ofed/drivers/infiniband/core/ib_user_mad.c > > Modified: head/sys/ofed/drivers/infiniband/core/ib_user_mad.c > ============================================================================== > --- head/sys/ofed/drivers/infiniband/core/ib_user_mad.c Wed Jun 13 23:19:54 2018 (r335093) > +++ head/sys/ofed/drivers/infiniband/core/ib_user_mad.c Wed Jun 13 23:30:54 2018 (r335094) > @@ -130,7 +130,8 @@ struct ib_umad_packet { > > static struct class *umad_class; > > -static const dev_t base_dev = MKDEV(IB_UMAD_MAJOR, IB_UMAD_MINOR_BASE); > +#define IBMKDEV(x, y) (((dev_t)(x) << 32) | (unsigned)(y)) > +static const dev_t base_dev = IBMKDEV(IB_UMAD_MAJOR, IB_UMAD_MINOR_BASE); > > static DEFINE_SPINLOCK(port_lock); > static DECLARE_BITMAP(dev_map, IB_UMAD_MAX_PORTS); > The scheme for major/minor encoding is different as of r335053. Won't that matter? In sys/ofed/drivers/infiniband/core/{ib_ucm.c,ib_uverbs_main.c} the pattern is to #define the MKDEV(). Following that would in ib_user_mad.c would also resolve this. Or makedev could be re-macroized with the new scheme.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAHgpiFwQza_CEeu687s-HwnHPT%2BfcPk80nHkbU3Kn-aUM2AjHQ>