Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
Date:   Wed, 12 Jun 2019 12:59:11 -0700
From:   Jakub Kicinski <jakub.kicinski@netronome.com>
To:     Willem de Bruijn <willemdebruijn.kernel@gmail.com>
Cc:     peterz@infradead.org, netdev@vger.kernel.org, davem@davemloft.net,
        linux-kernel@vger.kernel.org, Willem de Bruijn <willemb@google.com>
Subject: Re: [PATCH] locking/static_key: always define
 static_branch_deferred_inc
Message-ID: <20190612125911.509d79f2@cakuba.netronome.com>
In-Reply-To: <20190612194409.197461-1-willemdebruijn.kernel@gmail.com>
References: <20190612194409.197461-1-willemdebruijn.kernel@gmail.com>
Organization: Netronome Systems, Ltd.
MIME-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

On Wed, 12 Jun 2019 15:44:09 -0400, Willem de Bruijn wrote:
> From: Willem de Bruijn <willemb@google.com>
> 
> This interface is currently only defined if CONFIG_JUMP_LABEL. Make it
> available also when jump labels are disabled.
> 
> Fixes: ad282a8117d50 ("locking/static_key: Add support for deferred static branches")
> Signed-off-by: Willem de Bruijn <willemb@google.com>
> 
> ---
> 
> The original patch went into 5.2-rc1, but this interface is not yet
> used, so this could target either 5.2 or 5.3.

Can we drop the Fixes tag?  It's an ugly omission but not a bug fix.

Are you planning to switch clean_acked_data_enable() to the helper once
merged?

Thanks!

> diff --git a/include/linux/jump_label_ratelimit.h b/include/linux/jump_label_ratelimit.h
> index 42710d5949ba..8c3ee291b2d8 100644
> --- a/include/linux/jump_label_ratelimit.h
> +++ b/include/linux/jump_label_ratelimit.h
> @@ -60,8 +60,6 @@ extern void jump_label_update_timeout(struct work_struct *work);
>  						   0),			\
>  	}
>  
> -#define static_branch_deferred_inc(x)	static_branch_inc(&(x)->key)
> -
>  #else	/* !CONFIG_JUMP_LABEL */
>  struct static_key_deferred {
>  	struct static_key  key;
> @@ -95,4 +93,7 @@ jump_label_rate_limit(struct static_key_deferred *key,
>  	STATIC_KEY_CHECK_USE(key);
>  }
>  #endif	/* CONFIG_JUMP_LABEL */
> +
> +#define static_branch_deferred_inc(x)	static_branch_inc(&(x)->key)
> +
>  #endif	/* _LINUX_JUMP_LABEL_RATELIMIT_H */