summaryrefslogtreecommitdiff
path: root/include/linux
diff options
context:
space:
mode:
authorJoel Granados <joel.granados@kernel.org>2025-04-29 15:30:00 +0300
committerJoel Granados <joel.granados@kernel.org>2025-07-23 12:52:47 +0300
commitd0d05f602c1504fb868ed4a560d1465d88a3c5e5 (patch)
treebd82a25220da535e095953033d42a01e3a234d13 /include/linux
parent19272b37aa4f83ca52bdf9c16d5d81bdd1354494 (diff)
downloadlinux-d0d05f602c1504fb868ed4a560d1465d88a3c5e5.tar.xz
module: Move modprobe_path and modules_disabled ctl_tables into the module subsys
Move module sysctl (modprobe_path and modules_disabled) out of sysctl.c and into the modules subsystem. Make modules_disabled static as it no longer needs to be exported. Remove module.h from the includes in sysctl as it no longer uses any module exported variables. This is part of a greater effort to move ctl tables into their respective subsystems which will reduce the merge conflicts in kernel/sysctl.c. Reviewed-by: Luis Chamberlain <mcgrof@kernel.org> Reviewed-by: Petr Pavlu <petr.pavlu@suse.com> Signed-off-by: Joel Granados <joel.granados@kernel.org>
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/kmod.h3
-rw-r--r--include/linux/module.h1
2 files changed, 0 insertions, 4 deletions
diff --git a/include/linux/kmod.h b/include/linux/kmod.h
index 68f69362d427..9a07c3215389 100644
--- a/include/linux/kmod.h
+++ b/include/linux/kmod.h
@@ -14,10 +14,7 @@
#include <linux/workqueue.h>
#include <linux/sysctl.h>
-#define KMOD_PATH_LEN 256
-
#ifdef CONFIG_MODULES
-extern char modprobe_path[]; /* for sysctl */
/* modprobe exit status on success, -ve on error. Return value
* usually useless though. */
extern __printf(2, 3)
diff --git a/include/linux/module.h b/include/linux/module.h
index 92e1420fccdf..e93cdb92ad92 100644
--- a/include/linux/module.h
+++ b/include/linux/module.h
@@ -304,7 +304,6 @@ struct notifier_block;
#ifdef CONFIG_MODULES
-extern int modules_disabled; /* for sysctl */
/* Get/put a kernel symbol (calls must be symmetric) */
void *__symbol_get(const char *symbol);
void *__symbol_get_gpl(const char *symbol);