svn commit: r315328 - in stable: 10/sys/ofed/drivers/infiniband/hw/mlx4 11/sys/ofed/drivers/infiniband/hw/mlx4

[Dimitry Andric]

Author: dim
Date: Wed Mar 15 19:50:58 2017
New Revision: 315328
URL: https://svnweb.freebsd.org/changeset/base/315328

Log:
  MFC r310232:
  
  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
  Differential Revision: https://reviews.freebsd.org/D8831

Modified:
  stable/10/sys/ofed/drivers/infiniband/hw/mlx4/sysfs.c
Directory Properties:
  stable/10/   (props changed)

Changes in other areas also in this revision:
Modified:
  stable/11/sys/ofed/drivers/infiniband/hw/mlx4/sysfs.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/10/sys/ofed/drivers/infiniband/hw/mlx4/sysfs.c
==============================================================================
--- stable/10/sys/ofed/drivers/infiniband/hw/mlx4/sysfs.c	Wed Mar 15 19:49:45 2017	(r315327)
+++ stable/10/sys/ofed/drivers/infiniband/hw/mlx4/sysfs.c	Wed Mar 15 19:50:58 2017	(r315328)
@@ -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;