Re: [PATCH][next] ice: make const read-only array dflt_rules static

[Colin King (gmail)]

Ignore, managed to mangle two commits into one.



On 17/03/2025 14:46, Colin Ian King wrote:
> Don't populate the const read-only array dflt_rules on the stack at run
> time, instead make it static.
>
> Signed-off-by: Colin Ian King <colin.i.king@xxxxxxxxx>
> ---
>   drivers/gpu/drm/i915/intel_memory_region.c        | 2 +-
>   drivers/net/ethernet/intel/ice/ice_ethtool_fdir.c | 2 +-
>   2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_memory_region.c b/drivers/gpu/drm/i915/intel_memory_region.c
> index d40ee1b42110..7f4102edc75b 100644
> --- a/drivers/gpu/drm/i915/intel_memory_region.c
> +++ b/drivers/gpu/drm/i915/intel_memory_region.c
> @@ -62,7 +62,7 @@ static int iopagetest(struct intel_memory_region *mem,
>   		      resource_size_t offset,
>   		      const void *caller)
>   {
> -	const u8 val[] = { 0x0, 0xa5, 0xc3, 0xf0 };
> +	static const u8 val[] = { 0x0, 0xa5, 0xc3, 0xf0 };
>   	void __iomem *va;
>   	int err;
>   	int i;
> diff --git a/drivers/net/ethernet/intel/ice/ice_ethtool_fdir.c b/drivers/net/ethernet/intel/ice/ice_ethtool_fdir.c
> index 1d118171de37..aceec184e89b 100644
> --- a/drivers/net/ethernet/intel/ice/ice_ethtool_fdir.c
> +++ b/drivers/net/ethernet/intel/ice/ice_ethtool_fdir.c
> @@ -1605,7 +1605,7 @@ void ice_fdir_replay_fltrs(struct ice_pf *pf)
>    */
>   int ice_fdir_create_dflt_rules(struct ice_pf *pf)
>   {
> -	const enum ice_fltr_ptype dflt_rules[] = {
> +	static const enum ice_fltr_ptype dflt_rules[] = {
>   		ICE_FLTR_PTYPE_NONF_IPV4_TCP, ICE_FLTR_PTYPE_NONF_IPV4_UDP,
>   		ICE_FLTR_PTYPE_NONF_IPV6_TCP, ICE_FLTR_PTYPE_NONF_IPV6_UDP,
>   	};

Attachment: OpenPGP_0x68C287DFC6A80226.asc
Description: OpenPGP public key

Attachment: OpenPGP_signature.asc
Description: OpenPGP digital signature