[PATCH v3 1/3] umh, treewide: Explicitly include linux/umh.h where needed
From: Petr Pavlu <petr.pavlu@suse.com>
Date: 2026-09-11 14:47:02
Also in:
bridge, cgroups, dri-devel, driver-core, keyrings, linux-acpi, linux-block, linux-edac, linux-fsdevel, linux-modules, linux-nfs, linux-pm, linux-security-module, linuxppc-dev, lkml, netdev, ocfs2-devel
Subsystem:
block layer, control group (cgroup), drbd driver, driver core, kobjects, debugfs and sysfs, ethernet bridge, filesystems (vfs and infrastructure), framebuffer layer, greybus subsystem, hibernation (aka software suspend, aka swsusp), kernel nfsd, sunrpc, and lockd servers, kernel usermode helper, keys/keyrings, library code, linux for power macintosh, module support, networking [general], nfs, sunrpc, and lockd clients, oracle cluster filesystem 2 (ocfs2), pnp support, security subsystem, suspend to ram, the rest, tomoyo security module, uvesafb driver, x86 architecture (32-bit and 64-bit), x86 mce infrastructure · Maintainers:
Jens Axboe, Tejun Heo, Johannes Weiner, Michal Koutný, Philipp Reisner, Lars Ellenberg, Christoph Böhmwalder, Greg Kroah-Hartman, "Rafael J. Wysocki", Danilo Krummrich, Nikolay Aleksandrov, Ido Schimmel, Alexander Viro, Christian Brauner, Helge Deller, Johan Hovold, Alex Elder, Chuck Lever, Jeff Layton, Luis Chamberlain, David Howells, Jarkko Sakkinen, Andrew Morton, Petr Pavlu, Daniel Gomez, Sami Tolvanen, "David S. Miller", Eric Dumazet, Jakub Kicinski, Paolo Abeni, Trond Myklebust, Anna Schumaker, Mark Fasheh, Joel Becker, Joseph Qi, Paul Moore, James Morris, "Serge E. Hallyn", Linus Torvalds, Kentaro Takeda, Tetsuo Handa, Michal Januszewski, Thomas Gleixner, Ingo Molnar, Borislav Petkov, Dave Hansen, Tony Luck
The usermode helper declarations were previously provided by linux/kmod.h
but commit c1f3fa2a4fde ("kmod: split off umh headers into its own file")
moved them to linux/umh.h in 2017.
Add explicit includes of linux/umh.h to files that use usermode helpers and
remove linux/kmod.h where it is no longer needed.
Signed-off-by: Petr Pavlu <petr.pavlu@suse.com>
---
arch/x86/kernel/cpu/mce/dev-mcelog.c | 2 +-
drivers/block/drbd/drbd_nl.c | 1 +
drivers/greybus/svc_watchdog.c | 1 +
drivers/macintosh/windfarm_core.c | 1 +
drivers/pnp/pnpbios/core.c | 2 +-
drivers/video/fbdev/uvesafb.c | 1 +
fs/coredump.c | 2 +-
fs/nfs/cache_lib.c | 2 +-
fs/nfsd/nfs4layouts.c | 2 +-
fs/nfsd/nfs4recover.c | 1 +
fs/ocfs2/stackglue.c | 1 +
kernel/cgroup/cgroup-v1.c | 2 +-
kernel/module/kmod.c | 1 +
kernel/power/process.c | 2 +-
kernel/reboot.c | 2 +-
kernel/umh.c | 2 +-
lib/kobject_uevent.c | 2 +-
net/bridge/br_stp_if.c | 2 +-
security/keys/request_key.c | 2 +-
security/tomoyo/common.h | 2 +-
20 files changed, 20 insertions(+), 13 deletions(-)
diff --git a/arch/x86/kernel/cpu/mce/dev-mcelog.c b/arch/x86/kernel/cpu/mce/dev-mcelog.c
index 053555206d81..af4e76babe7a 100644
--- a/arch/x86/kernel/cpu/mce/dev-mcelog.c
+++ b/arch/x86/kernel/cpu/mce/dev-mcelog.c@@ -11,7 +11,7 @@ #include <linux/miscdevice.h> #include <linux/slab.h> -#include <linux/kmod.h> +#include <linux/umh.h> #include <linux/poll.h> #include "internal.h"
diff --git a/drivers/block/drbd/drbd_nl.c b/drivers/block/drbd/drbd_nl.c
index b77f901fc3ef..6f5d059394b3 100644
--- a/drivers/block/drbd/drbd_nl.c
+++ b/drivers/block/drbd/drbd_nl.c@@ -14,6 +14,7 @@ #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt #include <linux/module.h> +#include <linux/umh.h> #include <linux/drbd.h> #include <linux/in.h> #include <linux/fs.h>
diff --git a/drivers/greybus/svc_watchdog.c b/drivers/greybus/svc_watchdog.c
index 16e6de5e9eff..b318eb34bcca 100644
--- a/drivers/greybus/svc_watchdog.c
+++ b/drivers/greybus/svc_watchdog.c@@ -7,6 +7,7 @@ #include <linux/delay.h> #include <linux/suspend.h> +#include <linux/umh.h> #include <linux/workqueue.h> #include <linux/greybus.h>
diff --git a/drivers/macintosh/windfarm_core.c b/drivers/macintosh/windfarm_core.c
index 5307b1e34261..e66de11c69a3 100644
--- a/drivers/macintosh/windfarm_core.c
+++ b/drivers/macintosh/windfarm_core.c@@ -34,6 +34,7 @@ #include <linux/platform_device.h> #include <linux/mutex.h> #include <linux/freezer.h> +#include <linux/umh.h> #include "windfarm.h"
diff --git a/drivers/pnp/pnpbios/core.c b/drivers/pnp/pnpbios/core.c
index f7e86ae9f72f..46af1f549337 100644
--- a/drivers/pnp/pnpbios/core.c
+++ b/drivers/pnp/pnpbios/core.c@@ -47,7 +47,7 @@ #include <linux/delay.h> #include <linux/acpi.h> #include <linux/freezer.h> -#include <linux/kmod.h> +#include <linux/umh.h> #include <linux/kthread.h> #include <asm/page.h>
diff --git a/drivers/video/fbdev/uvesafb.c b/drivers/video/fbdev/uvesafb.c
index ccc9dbc25813..a13dff332aef 100644
--- a/drivers/video/fbdev/uvesafb.c
+++ b/drivers/video/fbdev/uvesafb.c@@ -23,6 +23,7 @@ #include <linux/io.h> #include <linux/mutex.h> #include <linux/slab.h> +#include <linux/umh.h> #include <video/edid.h> #include <video/uvesafb.h> #ifdef CONFIG_X86
diff --git a/fs/coredump.c b/fs/coredump.c
index 6114839f5178..bdef7ec27b0e 100644
--- a/fs/coredump.c
+++ b/fs/coredump.c@@ -32,7 +32,7 @@ #include <linux/tsacct_kern.h> #include <linux/cn_proc.h> #include <linux/audit.h> -#include <linux/kmod.h> +#include <linux/umh.h> #include <linux/fsnotify.h> #include <linux/fs_struct.h> #include <linux/pipe_fs_i.h>
diff --git a/fs/nfs/cache_lib.c b/fs/nfs/cache_lib.c
index 9738a1ae92ca..ca4e81d4e315 100644
--- a/fs/nfs/cache_lib.c
+++ b/fs/nfs/cache_lib.c@@ -6,7 +6,7 @@ * * Copyright (c) 2009 Trond Myklebust <Trond.Myklebust@netapp.com> */ -#include <linux/kmod.h> +#include <linux/umh.h> #include <linux/module.h> #include <linux/moduleparam.h> #include <linux/mount.h>
diff --git a/fs/nfsd/nfs4layouts.c b/fs/nfsd/nfs4layouts.c
index 22bcb6d09f70..5739d4d2ed3c 100644
--- a/fs/nfsd/nfs4layouts.c
+++ b/fs/nfsd/nfs4layouts.c@@ -3,7 +3,7 @@ * Copyright (c) 2014 Christoph Hellwig. */ #include <linux/exportfs_block.h> -#include <linux/kmod.h> +#include <linux/umh.h> #include <linux/file.h> #include <linux/jhash.h> #include <linux/sched.h>
diff --git a/fs/nfsd/nfs4recover.c b/fs/nfsd/nfs4recover.c
index d513971fb119..5bef3f0034d3 100644
--- a/fs/nfsd/nfs4recover.c
+++ b/fs/nfsd/nfs4recover.c@@ -41,6 +41,7 @@ #include <linux/fs.h> #include <linux/hex.h> #include <linux/module.h> +#include <linux/umh.h> #include <net/net_namespace.h> #include <linux/sunrpc/rpc_pipe_fs.h> #include <linux/sunrpc/clnt.h>
diff --git a/fs/ocfs2/stackglue.c b/fs/ocfs2/stackglue.c
index 741d6191d871..0ccaab29426d 100644
--- a/fs/ocfs2/stackglue.c
+++ b/fs/ocfs2/stackglue.c@@ -18,6 +18,7 @@ #include <linux/kobject.h> #include <linux/sysfs.h> #include <linux/sysctl.h> +#include <linux/umh.h> #include "ocfs2_fs.h"
diff --git a/kernel/cgroup/cgroup-v1.c b/kernel/cgroup/cgroup-v1.c
index a4337c9b5287..cbcde5c28b18 100644
--- a/kernel/cgroup/cgroup-v1.c
+++ b/kernel/cgroup/cgroup-v1.c@@ -2,7 +2,7 @@ #include "cgroup-internal.h" #include <linux/ctype.h> -#include <linux/kmod.h> +#include <linux/umh.h> #include <linux/sort.h> #include <linux/delay.h> #include <linux/mm.h>
diff --git a/kernel/module/kmod.c b/kernel/module/kmod.c
index a25dccdf7aa7..dcaad5d65275 100644
--- a/kernel/module/kmod.c
+++ b/kernel/module/kmod.c@@ -28,6 +28,7 @@ #include <linux/ptrace.h> #include <linux/async.h> #include <linux/uaccess.h> +#include <linux/umh.h> #include <trace/events/module.h> #include "internal.h"
diff --git a/kernel/power/process.c b/kernel/power/process.c
index dc0dfc349f22..295904ec9a82 100644
--- a/kernel/power/process.c
+++ b/kernel/power/process.c@@ -16,7 +16,7 @@ #include <linux/freezer.h> #include <linux/delay.h> #include <linux/workqueue.h> -#include <linux/kmod.h> +#include <linux/umh.h> #include <trace/events/power.h> #include <linux/cpuset.h>
diff --git a/kernel/reboot.c b/kernel/reboot.c
index f070c5c1103a..37818be501c0 100644
--- a/kernel/reboot.c
+++ b/kernel/reboot.c@@ -11,13 +11,13 @@ #include <linux/ctype.h> #include <linux/export.h> #include <linux/kexec.h> -#include <linux/kmod.h> #include <linux/kmsg_dump.h> #include <linux/reboot.h> #include <linux/suspend.h> #include <linux/syscalls.h> #include <linux/syscore_ops.h> #include <linux/uaccess.h> +#include <linux/umh.h> /* * this indicates whether you can reboot with ctrl-alt-del: the default is yes
diff --git a/kernel/umh.c b/kernel/umh.c
index 6e2c7bb315c6..512dc018a50b 100644
--- a/kernel/umh.c
+++ b/kernel/umh.c@@ -8,7 +8,7 @@ #include <linux/binfmts.h> #include <linux/syscalls.h> #include <linux/unistd.h> -#include <linux/kmod.h> +#include <linux/umh.h> #include <linux/slab.h> #include <linux/completion.h> #include <linux/cred.h>
diff --git a/lib/kobject_uevent.c b/lib/kobject_uevent.c
index ddbc4d7482d2..a67129e452a3 100644
--- a/lib/kobject_uevent.c
+++ b/lib/kobject_uevent.c@@ -17,7 +17,7 @@ #include <linux/string.h> #include <linux/kobject.h> #include <linux/export.h> -#include <linux/kmod.h> +#include <linux/umh.h> #include <linux/slab.h> #include <linux/socket.h> #include <linux/skbuff.h>
diff --git a/net/bridge/br_stp_if.c b/net/bridge/br_stp_if.c
index a7e5422eb5d1..89bc161a4b47 100644
--- a/net/bridge/br_stp_if.c
+++ b/net/bridge/br_stp_if.c@@ -8,7 +8,7 @@ */ #include <linux/kernel.h> -#include <linux/kmod.h> +#include <linux/umh.h> #include <linux/etherdevice.h> #include <linux/rtnetlink.h> #include <net/switchdev.h>
diff --git a/security/keys/request_key.c b/security/keys/request_key.c
index fa2bb9f2f538..e6ba2d054399 100644
--- a/security/keys/request_key.c
+++ b/security/keys/request_key.c@@ -9,7 +9,7 @@ #include <linux/export.h> #include <linux/sched.h> -#include <linux/kmod.h> +#include <linux/umh.h> #include <linux/err.h> #include <linux/keyctl.h> #include <linux/slab.h>
diff --git a/security/tomoyo/common.h b/security/tomoyo/common.h
index d098cf8aae61..d26034000913 100644
--- a/security/tomoyo/common.h
+++ b/security/tomoyo/common.h@@ -16,7 +16,7 @@ #include <linux/string.h> #include <linux/mm.h> #include <linux/file.h> -#include <linux/kmod.h> +#include <linux/umh.h> #include <linux/fs.h> #include <linux/sched.h> #include <linux/namei.h>
--
2.55.0