Skip to content

Commit

Permalink
Merge tag 'sysctl-6.5-rc1-fixes' of git://git.kernel.org/pub/scm/linu…
Browse files Browse the repository at this point in the history
…x/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
  • Loading branch information
Linus Torvalds committed Jun 30, 2023
2 parents 43ec8a6 + 554588e commit 82a2a51
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion kernel/umh.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand Down Expand Up @@ -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",
Expand Down

0 comments on commit 82a2a51

Please sign in to comment.