From owner-svn-src-all@freebsd.org Wed Mar 15 12:52:32 2017 Return-Path: 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 3D739D0C57B; Wed, 15 Mar 2017 12:52:32 +0000 (UTC) (envelope-from hps@selasky.org) Received: from mail.turbocat.net (turbocat.net [88.99.82.50]) (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 00E6611CE; Wed, 15 Mar 2017 12:52:31 +0000 (UTC) (envelope-from hps@selasky.org) Received: from hps2016.home.selasky.org (unknown [62.141.129.119]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.turbocat.net (Postfix) with ESMTPSA id 5AA7F1FE025; Wed, 15 Mar 2017 13:51:37 +0100 (CET) Subject: Re: svn commit: r310232 - head/sys/dev/mlx4/mlx4_ib To: Dimitry Andric , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org, Meny Yossefi References: <201612181521.uBIFLcB3030383@repo.freebsd.org> From: Hans Petter Selasky Message-ID: <9290641f-00e0-4091-e641-448d2d0d24d6@selasky.org> Date: Wed, 15 Mar 2017 13:51:33 +0100 User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:45.0) Gecko/20100101 Thunderbird/45.7.1 MIME-Version: 1.0 In-Reply-To: <201612181521.uBIFLcB3030383@repo.freebsd.org> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 Mar 2017 12:52:32 -0000 Hi, Can you MFC this patch to 11-stable and 10-stable. The directory layout is a bit different, so you'll need to manually apply the patch to sys/ofed/drivers/infiniband/hw/mlx4/sysfs.c after merging the patch and resolving the non-existing path. --HPS On 12/18/16 16:21, Dimitry Andric wrote: > Author: dim > Date: Sun Dec 18 15:21:38 2016 > New Revision: 310232 > URL: https://svnweb.freebsd.org/changeset/base/310232 > > Log: > After r310171, the kernel version of sscanf() has format string checking > enabled. This results in a -Werror warning in mlx4ib: > > sys/dev/mlx4/mlx4_ib/mlx4_ib_sysfs.c:90:22: error: format specifies type 'unsigned long long *' but the argument has type 'u64 *' (aka 'unsigned long *') [-Werror,-Wformat] > sscanf(buf, "%llx", &sysadmin_ag_val); > ~~~~ ^~~~~~~~~~~~~~~~ > > Change sysadmin_ag_val to unsigned long long to avoid the warning. > > Reviewed by: hselasky > MFC after: 3 days > Differential Revision: https://reviews.freebsd.org/D8831 > > Modified: > head/sys/dev/mlx4/mlx4_ib/mlx4_ib_sysfs.c > > Modified: head/sys/dev/mlx4/mlx4_ib/mlx4_ib_sysfs.c > ============================================================================== > --- head/sys/dev/mlx4/mlx4_ib/mlx4_ib_sysfs.c Sun Dec 18 15:10:08 2016 (r310231) > +++ head/sys/dev/mlx4/mlx4_ib/mlx4_ib_sysfs.c Sun Dec 18 15:21:38 2016 (r310232) > @@ -79,7 +79,7 @@ static ssize_t store_admin_alias_guid(st > container_of(attr, struct mlx4_ib_iov_sysfs_attr, dentry); > struct mlx4_ib_iov_port *port = mlx4_ib_iov_dentry->ctx; > struct mlx4_ib_dev *mdev = port->dev; > - u64 sysadmin_ag_val; > + unsigned long long sysadmin_ag_val; > > record_num = mlx4_ib_iov_dentry->entry_num / 8; > guid_index_in_rec = mlx4_ib_iov_dentry->entry_num % 8; > >