sysctl: fix unused proc_cap_handler() function warning
PATCH 1/1 sysctl: fix unused proc_cap_handler() function warning
From: Arnd Bergmann <[email protected]>
Since usermodehelper_table() is marked static now, we get a warning about it being unused when SYSCTL is disabled:
kernel/umh.c:497:12: error: 'proc_cap_handler' defined but not used [-Werror=unused-function]
Just move it inside of the same #ifdef.
--- kernel/umh.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/umh.c +1 -1
@@ -494,6 +494,7 @@ int call_usermodehelper(const char *path, char **argv, char **envp, int wait) }EXPORT_SYMBOL (call_usermodehelper); +#if defined(CONFIG_SYSCTL )static int proc_cap_handler (struct ctl_table *table,int write,void *buffer,size_t *lenp,loff_t *ppos) {
@@ -544,7 +545,6 @@ static int proc_cap_handler(struct ctl_table *table, int write,return 0 ; } -#if defined(CONFIG_SYSCTL)static struct ctl_table usermodehelper_table[] = { { .procname ="bset" ,
Signature · 1 line
2.39.2
Quoted 11 lines · Arnd Bergmann
From: Arnd Bergmann <[email protected]>
Since
usermodehelper_table()is marked static now, we get a warning about it being unused when SYSCTL is disabled:
kernel/umh.c:497:12: error: 'proc_cap_handler' defined but not used [-Werror=unused-function]Just move it inside of the same #ifdef.
Fixes e6944e3b75df7 ("sysctl: move umh sysctl registration to its own file")Signed-off-by Arnd Bergmann <[email protected]>
Thanks.
Quoted 24 lines
--- kernel/umh.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)kernel/umh.c +1
-1@@ -494,6 +494,7 @@ int call_usermodehelper(const char *path, char **argv, char **envp, int wait) }EXPORT_SYMBOL (call_usermodehelper); +#if defined(CONFIG_SYSCTL )static int proc_cap_handler (struct ctl_table *table,int write,void *buffer,size_t *lenp,loff_t *ppos) {@@ -544,7 +545,6 @@ static int proc_cap_handler(struct ctl_table *table, int write,return 0 ; } -#if defined(CONFIG_SYSCTL)static struct ctl_table usermodehelper_table[] = { { .procname ="bset" ,
Signature · 1 line
~Randy
Hi Arnd,
Quoted 6 lines · Arnd Bergmann
From: Arnd Bergmann <[email protected]>
Since
usermodehelper_table()is marked static now, we get a warning about it being unused when SYSCTL is disabled:
kernel/umh.c:497:12: error: 'proc_cap_handler' defined but not used [-Werror=unused-function]
Thank you for the patch!
We also hit the same issue on our side after today's sync with Linus' tree. I confirm this patch fixes the issue.
I didn't see this patch applied in Luis' sysctl-next branch, do you know who is taking care of it?
Quoted 3 lines
Just move it inside of the same #ifdef.
Fixes e6944e3b75df7 ("sysctl: move umh sysctl registration to its own file")
A small detail: it looks like the SHA has been modified, it should be 861dc0b46432 instead of e6944e3b75df7:
Cheers,
Matt
Signature · 2 lines
Tessares | Belgium | Hybrid Access Solutions www.tessares.net
Luis Chamberlain
maintainerQuoted 12 lines · Matthieu Baerts
Hi Arnd,
Quoted 6 lines · Arnd Bergmann
From: Arnd Bergmann <[email protected]>
Since
usermodehelper_table()is marked static now, we get a warning about it being unused when SYSCTL is disabled:
kernel/umh.c:497:12: error: 'proc_cap_handler' defined but not used [-Werror=unused-function]Thank you for the patch!
Quoted 7 lines
We also hit the same issue on our side after today's sync with Linus' tree. I confirm this patch fixes the issue.
Tested-by Matthieu Baerts <[email protected]>I didn't see this patch applied in Luis' sysctl-next branch, do you know who is taking care of it?
I'll send a second pull request to Linus now.
Quoted 8 lines
Quoted 3 lines
Just move it inside of the same #ifdef.
Fixes e6944e3b75df7 ("sysctl: move umh sysctl registration to its own file")A small detail: it looks like the SHA has been modified, it should be
861dc0b46432instead ofe6944e3b75df7:Fixes 861dc0b46432 ("sysctl: move umh sysctl registration to its own file")
Adjusted, thanks.
Luis