Commit 82a2a510 authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'sysctl-6.5-rc1-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux

Pull sysctl fix from Luis Chamberlain:
 "A missed minor fix which Matthieu Baerts noted I had not picked up"

* tag 'sysctl-6.5-rc1-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux:
  sysctl: fix unused proc_cap_handler() function warning
parents 43ec8a62 554588e8
...@@ -494,6 +494,7 @@ int call_usermodehelper(const char *path, char **argv, char **envp, int wait) ...@@ -494,6 +494,7 @@ int call_usermodehelper(const char *path, char **argv, char **envp, int wait)
} }
EXPORT_SYMBOL(call_usermodehelper); EXPORT_SYMBOL(call_usermodehelper);
#if defined(CONFIG_SYSCTL)
static int proc_cap_handler(struct ctl_table *table, int write, static int proc_cap_handler(struct ctl_table *table, int write,
void *buffer, size_t *lenp, loff_t *ppos) void *buffer, size_t *lenp, loff_t *ppos)
{ {
...@@ -544,7 +545,6 @@ static int proc_cap_handler(struct ctl_table *table, int write, ...@@ -544,7 +545,6 @@ static int proc_cap_handler(struct ctl_table *table, int write,
return 0; return 0;
} }
#if defined(CONFIG_SYSCTL)
static struct ctl_table usermodehelper_table[] = { static struct ctl_table usermodehelper_table[] = {
{ {
.procname = "bset", .procname = "bset",
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment