]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
net/mlx5: Fix addr's type in mlx5dr_icm_dm
authorNathan Chancellor <natechancellor@gmail.com>
Thu, 5 Sep 2019 02:14:15 +0000 (19:14 -0700)
committerSaeed Mahameed <saeedm@mellanox.com>
Tue, 10 Sep 2019 20:43:16 +0000 (13:43 -0700)
clang errors when CONFIG_PHYS_ADDR_T_64BIT is not set:

drivers/net/ethernet/mellanox/mlx5/core/steering/dr_icm_pool.c:121:8:
error: incompatible pointer types passing 'u64 *' (aka 'unsigned long
long *') to parameter of type 'phys_addr_t *' (aka 'unsigned int *')
[-Werror,-Wincompatible-pointer-types]
                                   &icm_mr->dm.addr, &icm_mr->dm.obj_id);
                                   ^~~~~~~~~~~~~~~~
include/linux/mlx5/driver.h:1092:39: note: passing argument to parameter
'addr' here
                         u64 length, u16 uid, phys_addr_t *addr, u32 *obj_id);
                                                           ^
1 error generated.

Use phys_addr_t for addr's type in mlx5dr_icm_dm, which won't change
anything with 64-bit builds because phys_addr_t is u64 when
CONFIG_PHYS_ADDR_T_64BIT is set, which is always when CONFIG_64BIT is
set.

Fixes: 29cf8febd185 ("net/mlx5: DR, ICM pool memory allocator")
Link: https://github.com/ClangBuiltLinux/linux/issues/653
Signed-off-by: Nathan Chancellor <natechancellor@gmail.com>
Reported-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Saeed Mahameed <saeedm@mellanox.com>
drivers/net/ethernet/mellanox/mlx5/core/steering/dr_icm_pool.c

index e76f61e7555e5d8cc3b87cca0d686dfbf01568dd..913f1e5aaaf2667c8130e5352f4ae8744a5b153e 100644 (file)
@@ -53,7 +53,7 @@ struct mlx5dr_icm_pool {
 struct mlx5dr_icm_dm {
        u32 obj_id;
        enum mlx5_sw_icm_type type;
-       u64 addr;
+       phys_addr_t addr;
        size_t length;
 };