Index: sys/dev/mlx4/mlx4_core/mlx4_main.c =================================================================== --- sys/dev/mlx4/mlx4_core/mlx4_main.c +++ sys/dev/mlx4/mlx4_core/mlx4_main.c @@ -1160,6 +1160,8 @@ return err; } +static DEFINE_MUTEX(mlx4_set_port_type_mutex); + static ssize_t set_port_type(struct device *dev, struct device_attribute *attr, const char *buf, size_t count) @@ -1168,10 +1170,9 @@ port_attr); struct mlx4_dev *mdev = info->dev; enum mlx4_port_type port_type; - static DEFINE_MUTEX(set_port_type_mutex); int err; - mutex_lock(&set_port_type_mutex); + mutex_lock(&mlx4_set_port_type_mutex); if (!strcmp(buf, "ib\n")) { port_type = MLX4_PORT_TYPE_IB; @@ -1188,7 +1189,7 @@ err = __set_port_type(info, port_type); err_out: - mutex_unlock(&set_port_type_mutex); + mutex_unlock(&mlx4_set_port_type_mutex); return err ? err : count; }