Skip to content

Commit 2355869

Browse files
mcgroftorvalds
mcgrof
authored and
torvalds
committed
kmod: split out umh code into its own file
Patch series "kmod: few code cleanups to split out umh code" The usermode helper has a provenance from the old usb code which first required a usermode helper. Eventually this was shoved into kmod.c and the kernel's modprobe calls was converted over eventually to share the same code. Over time the list of usermode helpers in the kernel has grown -- so kmod is just but one user of the API. This series is a simple logical cleanup which acknowledges the code evolution of the usermode helper and shoves the UMH API into its own dedicated file. This way users of the API can later just include umh.h instead of kmod.h. Note despite the diff state the first patch really is just a code shove, no functional changes are done there. I did use git format-patch -M to generate the patch, but in the end the split was not enough for git to consider it a rename hence the large diffstat. I've put this through 0-day and it gives me their machine compilation blessings with all tests as OK. This patch (of 4): There's a slew of usermode helper users and kmod is just one of them. Split out the usermode helper code into its own file to keep the logic and focus split up. This change provides no functional changes. Link: http://lkml.kernel.org/r/20170810180618.22457-2-mcgrof@kernel.org Signed-off-by: Luis R. Rodriguez <mcgrof@kernel.org> Cc: Kees Cook <keescook@chromium.org> Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com> Cc: Jessica Yu <jeyu@redhat.com> Cc: Rusty Russell <rusty@rustcorp.com.au> Cc: Michal Marek <mmarek@suse.com> Cc: Petr Mladek <pmladek@suse.com> Cc: Miroslav Benes <mbenes@suse.cz> Cc: Josh Poimboeuf <jpoimboe@redhat.com> Cc: Guenter Roeck <linux@roeck-us.net> Cc: "Eric W. Biederman" <ebiederm@xmission.com> Cc: Matt Redfearn <matt.redfearn@imgtec.com> Cc: Dan Carpenter <dan.carpenter@oracle.com> Cc: Colin Ian King <colin.king@canonical.com> Cc: Daniel Mentz <danielmentz@google.com> Cc: David Binderman <dcb314@hotmail.com> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
1 parent 52c270d commit 2355869

4 files changed

Lines changed: 577 additions & 559 deletions

File tree

‎MAINTAINERS‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7457,6 +7457,12 @@ S: Maintained
74577457
F: tools/testing/selftests/
74587458
F: Documentation/dev-tools/kselftest*
74597459

7460+
KERNEL USERMODE HELPER
7461+
M: "Luis R. Rodriguez" <mcgrof@kernel.org>
7462+
L: linux-kernel@vger.kernel.org
7463+
S: Maintained
7464+
F: kernel/umh.c
7465+
74607466
KERNEL VIRTUAL MACHINE (KVM)
74617467
M: Paolo Bonzini <pbonzini@redhat.com>
74627468
M: Radim Krčmář <rkrcmar@redhat.com>

‎kernel/Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
obj-y = fork.o exec_domain.o panic.o \
66
cpu.o exit.o softirq.o resource.o \
77
sysctl.o sysctl_binary.o capability.o ptrace.o user.o \
8-
signal.o sys.o kmod.o workqueue.o pid.o task_work.o \
8+
signal.o sys.o umh.o kmod.o workqueue.o pid.o task_work.o \
99
extable.o params.o \
1010
kthread.o sys_ni.o nsproxy.o \
1111
notifier.o ksysfs.o cred.o reboot.o \

0 commit comments

Comments
 (0)