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

torvalds · torvalds · commit 82a2a5105589 · 2023-06-29T17:44:56.000-07:00
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
diff --git 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",

Original file line number	Diff line number	Diff line change
`@@ -494,6 +494,7 @@ int call_usermodehelper(const char path, char argv, char *envp, int wait)`
`494`	`494`	`}`
`495`	`495`	`EXPORT_SYMBOL(call_usermodehelper);`
`496`	`496`
	`497`	`+#if defined(CONFIG_SYSCTL)`
`497`	`498`	`static int proc_cap_handler(struct ctl_table *table, int write,`
`498`	`499`	`void buffer, size_t lenp, loff_t *ppos)`
`499`	`500`	`{`
`@@ -544,7 +545,6 @@ static int proc_cap_handler(struct ctl_table *table, int write,`
`544`	`545`	`return 0;`
`545`	`546`	`}`
`546`	`547`
`547`		`-#if defined(CONFIG_SYSCTL)`
`548`	`548`	`static struct ctl_table usermodehelper_table[] = {`
`549`	`549`	`{`
`550`	`550`	`.procname = "bset",`