bpf: fix sysctl.c warning
diff mbox series

Message ID 20190304203443.1992942-1-arnd@arndb.de
State New
Headers show
Series
  • bpf: fix sysctl.c warning
Related show

Commit Message

Arnd Bergmann March 4, 2019, 8:34 p.m. UTC
When CONFIG_BPF_SYSCALL or CONFIG_SYSCTL is disabled, we get
a warning about an unused function:

kernel/sysctl.c:3331:12: error: 'proc_dointvec_minmax_bpf_stats' defined but not used [-Werror=unused-function]
 static int proc_dointvec_minmax_bpf_stats(struct ctl_table *table, int write,

The CONFIG_BPF_SYSCALL check was already handled, but the SYSCTL check
is needed on top.

Fixes: 492ecee892c2 ("bpf: enable program stats")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
 kernel/sysctl.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Kees Cook March 4, 2019, 8:47 p.m. UTC | #1
On Mon, Mar 4, 2019 at 12:34 PM Arnd Bergmann <arnd@arndb.de> wrote:
>
> When CONFIG_BPF_SYSCALL or CONFIG_SYSCTL is disabled, we get
> a warning about an unused function:
>
> kernel/sysctl.c:3331:12: error: 'proc_dointvec_minmax_bpf_stats' defined but not used [-Werror=unused-function]
>  static int proc_dointvec_minmax_bpf_stats(struct ctl_table *table, int write,
>
> The CONFIG_BPF_SYSCALL check was already handled, but the SYSCTL check
> is needed on top.
>
> Fixes: 492ecee892c2 ("bpf: enable program stats")
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>

Reviewed-by: Kees Cook <keescook@chromium.org>

-Kees

> ---
>  kernel/sysctl.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/kernel/sysctl.c b/kernel/sysctl.c
> index 46a0d0a14a66..b3df3ab7ac28 100644
> --- a/kernel/sysctl.c
> +++ b/kernel/sysctl.c
> @@ -3330,7 +3330,7 @@ int proc_doulongvec_ms_jiffies_minmax(struct ctl_table *table, int write,
>
>  #endif /* CONFIG_PROC_SYSCTL */
>
> -#ifdef CONFIG_BPF_SYSCALL
> +#if defined(CONFIG_BPF_SYSCALL) && defined(CONFIG_SYSCTL)
>  static int proc_dointvec_minmax_bpf_stats(struct ctl_table *table, int write,
>                                           void __user *buffer, size_t *lenp,
>                                           loff_t *ppos)
> --
> 2.20.0
>
Christian Brauner March 4, 2019, 8:57 p.m. UTC | #2
On Mon, Mar 04, 2019 at 09:34:12PM +0100, Arnd Bergmann wrote:
> When CONFIG_BPF_SYSCALL or CONFIG_SYSCTL is disabled, we get
> a warning about an unused function:
> 
> kernel/sysctl.c:3331:12: error: 'proc_dointvec_minmax_bpf_stats' defined but not used [-Werror=unused-function]
>  static int proc_dointvec_minmax_bpf_stats(struct ctl_table *table, int write,
> 
> The CONFIG_BPF_SYSCALL check was already handled, but the SYSCTL check
> is needed on top.
> 
> Fixes: 492ecee892c2 ("bpf: enable program stats")
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>

Reviewed-by: Christian Brauner <christian@brauner.io>

> ---
>  kernel/sysctl.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/kernel/sysctl.c b/kernel/sysctl.c
> index 46a0d0a14a66..b3df3ab7ac28 100644
> --- a/kernel/sysctl.c
> +++ b/kernel/sysctl.c
> @@ -3330,7 +3330,7 @@ int proc_doulongvec_ms_jiffies_minmax(struct ctl_table *table, int write,
>  
>  #endif /* CONFIG_PROC_SYSCTL */
>  
> -#ifdef CONFIG_BPF_SYSCALL
> +#if defined(CONFIG_BPF_SYSCALL) && defined(CONFIG_SYSCTL)
>  static int proc_dointvec_minmax_bpf_stats(struct ctl_table *table, int write,
>  					  void __user *buffer, size_t *lenp,
>  					  loff_t *ppos)
> -- 
> 2.20.0
>
Song Liu March 4, 2019, 8:58 p.m. UTC | #3
> On Mar 4, 2019, at 12:57 PM, Christian Brauner <christian@brauner.io> wrote:
> 
> On Mon, Mar 04, 2019 at 09:34:12PM +0100, Arnd Bergmann wrote:
>> When CONFIG_BPF_SYSCALL or CONFIG_SYSCTL is disabled, we get
>> a warning about an unused function:
>> 
>> kernel/sysctl.c:3331:12: error: 'proc_dointvec_minmax_bpf_stats' defined but not used [-Werror=unused-function]
>> static int proc_dointvec_minmax_bpf_stats(struct ctl_table *table, int write,
>> 
>> The CONFIG_BPF_SYSCALL check was already handled, but the SYSCTL check
>> is needed on top.
>> 
>> Fixes: 492ecee892c2 ("bpf: enable program stats")
>> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> 
> Reviewed-by: Christian Brauner <christian@brauner.io>

Acked-by: Song Liu <songliubraving@fb.com>

> 
>> ---
>> kernel/sysctl.c | 2 +-
>> 1 file changed, 1 insertion(+), 1 deletion(-)
>> 
>> diff --git a/kernel/sysctl.c b/kernel/sysctl.c
>> index 46a0d0a14a66..b3df3ab7ac28 100644
>> --- a/kernel/sysctl.c
>> +++ b/kernel/sysctl.c
>> @@ -3330,7 +3330,7 @@ int proc_doulongvec_ms_jiffies_minmax(struct ctl_table *table, int write,
>> 
>> #endif /* CONFIG_PROC_SYSCTL */
>> 
>> -#ifdef CONFIG_BPF_SYSCALL
>> +#if defined(CONFIG_BPF_SYSCALL) && defined(CONFIG_SYSCTL)
>> static int proc_dointvec_minmax_bpf_stats(struct ctl_table *table, int write,
>> 					  void __user *buffer, size_t *lenp,
>> 					  loff_t *ppos)
>> -- 
>> 2.20.0
>>
Daniel Borkmann March 7, 2019, 10:05 a.m. UTC | #4
On 03/04/2019 09:34 PM, Arnd Bergmann wrote:
> When CONFIG_BPF_SYSCALL or CONFIG_SYSCTL is disabled, we get
> a warning about an unused function:
> 
> kernel/sysctl.c:3331:12: error: 'proc_dointvec_minmax_bpf_stats' defined but not used [-Werror=unused-function]
>  static int proc_dointvec_minmax_bpf_stats(struct ctl_table *table, int write,
> 
> The CONFIG_BPF_SYSCALL check was already handled, but the SYSCTL check
> is needed on top.
> 
> Fixes: 492ecee892c2 ("bpf: enable program stats")
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>

Applied, thanks!

Patch
diff mbox series

diff --git a/kernel/sysctl.c b/kernel/sysctl.c
index 46a0d0a14a66..b3df3ab7ac28 100644
--- a/kernel/sysctl.c
+++ b/kernel/sysctl.c
@@ -3330,7 +3330,7 @@  int proc_doulongvec_ms_jiffies_minmax(struct ctl_table *table, int write,
 
 #endif /* CONFIG_PROC_SYSCTL */
 
-#ifdef CONFIG_BPF_SYSCALL
+#if defined(CONFIG_BPF_SYSCALL) && defined(CONFIG_SYSCTL)
 static int proc_dointvec_minmax_bpf_stats(struct ctl_table *table, int write,
 					  void __user *buffer, size_t *lenp,
 					  loff_t *ppos)