Skip to content

Commit 747f3cf

Browse files
committed
Merge tag 'mlx5-updates-2019-09-10' of git://git.kernel.org/pub/scm/linux/kernel/git/saeed/linux
Saeed Mahameed says: ==================== mlx5-updates-2019-09-10 Misc build warnings cleanup for mlx5: 1) Reduce stack usage in FW trace 2) Fix addr's type in mlx5dr_icm_dm 3) Fix rt's type in dr_action_create_reformat_action ==================== Signed-off-by: David S. Miller <[email protected]>
2 parents 6d47b4b + fa355bb commit 747f3cf

File tree

3 files changed

+6
-5
lines changed

3 files changed

+6
-5
lines changed

drivers/net/ethernet/mellanox/mlx5/core/diag/fw_tracer.c

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -553,9 +553,10 @@ static void mlx5_fw_tracer_save_trace(struct mlx5_fw_tracer *tracer,
553553
mutex_unlock(&tracer->st_arr.lock);
554554
}
555555

556-
static void mlx5_tracer_print_trace(struct tracer_string_format *str_frmt,
557-
struct mlx5_core_dev *dev,
558-
u64 trace_timestamp)
556+
static noinline
557+
void mlx5_tracer_print_trace(struct tracer_string_format *str_frmt,
558+
struct mlx5_core_dev *dev,
559+
u64 trace_timestamp)
559560
{
560561
char tmp[512];
561562

drivers/net/ethernet/mellanox/mlx5/core/steering/dr_action.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1074,7 +1074,7 @@ dr_action_create_reformat_action(struct mlx5dr_domain *dmn,
10741074
case DR_ACTION_TYP_L2_TO_TNL_L2:
10751075
case DR_ACTION_TYP_L2_TO_TNL_L3:
10761076
{
1077-
enum mlx5dr_action_type rt;
1077+
enum mlx5_reformat_ctx_type rt;
10781078

10791079
if (action->action_type == DR_ACTION_TYP_L2_TO_TNL_L2)
10801080
rt = MLX5_REFORMAT_TYPE_L2_TO_L2_TUNNEL;

drivers/net/ethernet/mellanox/mlx5/core/steering/dr_icm_pool.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ struct mlx5dr_icm_pool {
5353
struct mlx5dr_icm_dm {
5454
u32 obj_id;
5555
enum mlx5_sw_icm_type type;
56-
u64 addr;
56+
phys_addr_t addr;
5757
size_t length;
5858
};
5959

0 commit comments

Comments
 (0)