summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2023-06-07 14:08:54 +0200
committerLuis Chamberlain <mcgrof@kernel.org>2023-06-29 15:19:43 -0700
commit554588e8e932e7a0fac7d3ae2132f2b727d9acfe (patch)
tree10e708808b9647b9a49dac4e3ee6569f32980f23
parentc6b0271053e7a5ae57511363213777f706b60489 (diff)
sysctl: fix unused proc_cap_handler() function warning
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. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Tested-by: Matthieu Baerts <matthieu.baerts@tessares.net> Fixes: 861dc0b46432 ("sysctl: move umh sysctl registration to its own file") Acked-by: Randy Dunlap <rdunlap@infradead.org> Tested-by: Randy Dunlap <rdunlap@infradead.org> # build-tested [mcgrof: adjust new commit ID for Fixes tag] Signed-off-by: Luis Chamberlain <mcgrof@kernel.org>
-rw-r--r--kernel/umh.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/umh.c b/kernel/umh.c
index 41088c5c39fd..1b13c5d34624 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",