]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff
mlx4_core: Fix min() warning
authorAndrew Morton <akpm@linux-foundation.org>
Fri, 16 Jan 2009 04:43:56 +0000 (20:43 -0800)
committerRoland Dreier <rolandd@cisco.com>
Fri, 16 Jan 2009 04:43:56 +0000 (20:43 -0800)
Fix

    drivers/net/mlx4/profile.c: In function `mlx4_make_profile':
    drivers/net/mlx4/profile.c:110: warning: comparison of distinct pointer types lacks a cast

This happened because num_possible_cpus() was secretly changed by
commit ae7a47e7 ("cpumask: make cpumask.h eat its own dogfood.") from
returning "int" to (now) returning "unsigned int".  I think that was a
good change, so we should just swallow the fallout.

Cc: "David S. Miller" <davem@davemloft.net>
Cc: Roland Dreier <rolandd@cisco.com>
Cc: Yevgeny Petrilin <yevgenyp@mellanox.co.il>
Cc: Jack Morgenstein <jackm@dev.mellanox.co.il>
Cc: Vladimir Sokolovsky <vlad@mellanox.co.il>
Cc: Michael S. Tsirkin <mst@dev.mellanox.co.il>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Roland Dreier <rolandd@cisco.com>
drivers/net/mlx4/profile.c

index 919fb9eb1b624af90e696b8a0c67418eec3c43f0..cebdf3243ca16cccb974b553d4e46b556fd0ac46 100644 (file)
@@ -107,9 +107,9 @@ u64 mlx4_make_profile(struct mlx4_dev *dev,
        profile[MLX4_RES_AUXC].num    = request->num_qp;
        profile[MLX4_RES_SRQ].num     = request->num_srq;
        profile[MLX4_RES_CQ].num      = request->num_cq;
-       profile[MLX4_RES_EQ].num      = min(dev_cap->max_eqs,
-                                           dev_cap->reserved_eqs +
-                                           num_possible_cpus() + 1);
+       profile[MLX4_RES_EQ].num      = min_t(unsigned, dev_cap->max_eqs,
+                                             dev_cap->reserved_eqs +
+                                             num_possible_cpus() + 1);
        profile[MLX4_RES_DMPT].num    = request->num_mpt;
        profile[MLX4_RES_CMPT].num    = MLX4_NUM_CMPTS;
        profile[MLX4_RES_MTT].num     = request->num_mtt;