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]>
---
kernel/umh.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/kernel/umh.c b/kernel/umh.c
index d5dc3cc92d5c6..2f9249c2bf6ce 100644
--- a/kernel/umh.c
+++ b/kernel/umh.c
@@ -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",
--
2.39.2
On 6/7/23 05:08, Arnd Bergmann wrote:
> 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]>
Acked-by: Randy Dunlap <[email protected]>
Tested-by: Randy Dunlap <[email protected]> # build-tested
Thanks.
> ---
> kernel/umh.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/kernel/umh.c b/kernel/umh.c
> index d5dc3cc92d5c6..2f9249c2bf6ce 100644
> --- a/kernel/umh.c
> +++ b/kernel/umh.c
> @@ -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",
--
~Randy
Hi Arnd,
On 07/06/2023 14:08, Arnd Bergmann wrote:
> 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.
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?
> 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:
Fixes: 861dc0b46432 ("sysctl: move umh sysctl registration to its own file")
Cheers,
Matt
--
Tessares | Belgium | Hybrid Access Solutions
http://www.tessares.net
On Thu, Jun 29, 2023 at 05:00:42PM +0200, Matthieu Baerts wrote:
> Hi Arnd,
>
> On 07/06/2023 14:08, Arnd Bergmann wrote:
> > 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.
>
> 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.
> > 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:
>
> Fixes: 861dc0b46432 ("sysctl: move umh sysctl registration to its own file")
Adjusted, thanks.
Luis