From owner-svn-src-head@freebsd.org  Wed Jun 13 23:47:38 2018
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 6241B10027A9;
 Wed, 13 Jun 2018 23:47:38 +0000 (UTC)
 (envelope-from rlibby@gmail.com)
Received: from mail-pf0-f180.google.com (mail-pf0-f180.google.com
 [209.85.192.180])
 (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
 (Client CN "smtp.gmail.com",
 Issuer "Google Internet Authority G2" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id E041182F71;
 Wed, 13 Jun 2018 23:47:37 +0000 (UTC)
 (envelope-from rlibby@gmail.com)
Received: by mail-pf0-f180.google.com with SMTP id b17-v6so2242178pfi.0;
 Wed, 13 Jun 2018 16:47:37 -0700 (PDT)
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=1e100.net; s=20161025;
 h=x-gm-message-state:mime-version:in-reply-to:references:from:date
 :message-id:subject:to:cc;
 bh=l0VC7Yr+YiaraIxvBviIHf/TrOT8qaTLhZ48eneLQBA=;
 b=VWxqlTJoUbbZHWaBAyEUvT00Q5tWi8BypuLHE49xWxcjJCmDng198+hQaX0PWdv8It
 G/R0Yi6JMdR1E6U5BNbGMxdyG4WzvF0rtF36HC6oAYzaPNu3PMMNtoSx4SACGxSXh/9P
 UYRVN5Yi2TcsrHC9QO5k1ceKMt1HV42iCYZsq+glvEM7hh/+xU9DAUDhBQSO4c4FRsf4
 ZrMswapJv+IzwEitfK0tLWxGWxvSL9TX7rgd8+k4BHpMqkAyJ0cZy7jTVao3N3eVg0Lp
 3ztWuLsBm6tCAHjbbG0/T5KPdk09Xk/huLwm3JSPM7EjqVN0AYChbmdZbb0L40FRCds1
 bVrQ==
X-Gm-Message-State: APt69E27kKmrfSQ4D8PsN+6ZjkteQ/VRmpEir5OXUn9oPLqB9YivocQF
 nSSwFofontLqhwtbZsTxNbVBs0D4W+Y=
X-Google-Smtp-Source: ADUXVKLT9zx1yqhkj5OdiQkXU4OPfmIVK2BSOfJNLiPPUmuW6A6yM/8JqlOmK9uK1mfjE/pgoEpybA==
X-Received: by 2002:a63:2dc2:: with SMTP id
 t185-v6mr234503pgt.204.1528933651032; 
 Wed, 13 Jun 2018 16:47:31 -0700 (PDT)
Received: from mail-pf0-f171.google.com (mail-pf0-f171.google.com.
 [209.85.192.171])
 by smtp.gmail.com with ESMTPSA id n22-v6sm4376145pgv.60.2018.06.13.16.47.30
 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);
 Wed, 13 Jun 2018 16:47:30 -0700 (PDT)
Received: by mail-pf0-f171.google.com with SMTP id r11-v6so2233125pfl.6;
 Wed, 13 Jun 2018 16:47:30 -0700 (PDT)
X-Received: by 2002:a63:6ecb:: with SMTP id
 j194-v6mr237827pgc.158.1528933650582; 
 Wed, 13 Jun 2018 16:47:30 -0700 (PDT)
MIME-Version: 1.0
Received: by 2002:a17:90a:1581:0:0:0:0 with HTTP; Wed, 13 Jun 2018 16:47:30
 -0700 (PDT)
In-Reply-To: <201806132330.w5DNUsrE043573@repo.freebsd.org>
References: <201806132330.w5DNUsrE043573@repo.freebsd.org>
From: Ryan Libby <rlibby@freebsd.org>
Date: Wed, 13 Jun 2018 16:47:30 -0700
X-Gmail-Original-Message-ID: <CAHgpiFwQza_CEeu687s-HwnHPT+fcPk80nHkbU3Kn-aUM2AjHQ@mail.gmail.com>
Message-ID: <CAHgpiFwQza_CEeu687s-HwnHPT+fcPk80nHkbU3Kn-aUM2AjHQ@mail.gmail.com>
Subject: Re: svn commit: r335094 - head/sys/ofed/drivers/infiniband/core
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
Content-Type: text/plain; charset="UTF-8"
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.26
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/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: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 13 Jun 2018 23:47:38 -0000

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.