The patch titled
Subject: kmod: move #ifdef CONFIG_MODULES wrapper to Makefile
has been added to the -mm tree. Its filename is
kmod-move-ifdef-config_modules-wrapper-to-makefile.patch
This patch should soon appear at
http://ozlabs.org/~akpm/mmots/broken-out/kmod-move-ifdef-config_modules-wrapper-to-makefile.patch
and later at
http://ozlabs.org/~akpm/mmotm/broken-out/kmod-move-ifdef-config_modules-wrapper-to-makefile.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/SubmitChecklist when testing your code ***
The -mm tree is included into linux-next and is updated
there every 3-4 working days
------------------------------------------------------
From: "Luis R. Rodriguez" <mcgrof@xxxxxxxxxx>
Subject: kmod: move #ifdef CONFIG_MODULES wrapper to Makefile
The entire file is now conditionally compiled only when CONFIG_MODULES is
enabled, and this this is a bool. Just move this conditional to the
Makefile as its easier to read this way.
Link: http://lkml.kernel.org/r/20170810180618.22457-5-mcgrof@xxxxxxxxxx
Signed-off-by: Luis R. Rodriguez <mcgrof@xxxxxxxxxx>
Cc: Kees Cook <keescook@xxxxxxxxxxxx>
Cc: Dmitry Torokhov <dmitry.torokhov@xxxxxxxxx>
Cc: Jessica Yu <jeyu@xxxxxxxxxx>
Cc: Rusty Russell <rusty@xxxxxxxxxxxxxxx>
Cc: Michal Marek <mmarek@xxxxxxxx>
Cc: Petr Mladek <pmladek@xxxxxxxx>
Cc: Miroslav Benes <mbenes@xxxxxxx>
Cc: Josh Poimboeuf <jpoimboe@xxxxxxxxxx>
Cc: Guenter Roeck <linux@xxxxxxxxxxxx>
Cc: "Eric W. Biederman" <ebiederm@xxxxxxxxxxxx>
Cc: Matt Redfearn <matt.redfearn@xxxxxxxxxx>
Cc: Dan Carpenter <dan.carpenter@xxxxxxxxxx>
Cc: Colin Ian King <colin.king@xxxxxxxxxxxxx>
Cc: Daniel Mentz <danielmentz@xxxxxxxxxx>
Cc: David Binderman <dcb314@xxxxxxxxxxx>
Cc: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
kernel/Makefile | 3 ++-
kernel/kmod.c | 3 ---
2 files changed, 2 insertions(+), 4 deletions(-)
diff -puN kernel/Makefile~kmod-move-ifdef-config_modules-wrapper-to-makefile kernel/Makefile
--- a/kernel/Makefile~kmod-move-ifdef-config_modules-wrapper-to-makefile
+++ a/kernel/Makefile
@@ -5,12 +5,13 @@
obj-y = fork.o exec_domain.o panic.o \
cpu.o exit.o softirq.o resource.o \
sysctl.o sysctl_binary.o capability.o ptrace.o user.o \
- signal.o sys.o umh.o kmod.o workqueue.o pid.o task_work.o \
+ signal.o sys.o umh.o workqueue.o pid.o task_work.o \
extable.o params.o \
kthread.o sys_ni.o nsproxy.o \
notifier.o ksysfs.o cred.o reboot.o \
async.o range.o smpboot.o ucount.o
+obj-$(CONFIG_MODULES) += kmod.o
obj-$(CONFIG_MULTIUSER) += groups.o
ifdef CONFIG_FUNCTION_TRACER
diff -puN kernel/kmod.c~kmod-move-ifdef-config_modules-wrapper-to-makefile kernel/kmod.c
--- a/kernel/kmod.c~kmod-move-ifdef-config_modules-wrapper-to-makefile
+++ a/kernel/kmod.c
@@ -28,7 +28,6 @@
#include <trace/events/module.h>
-#ifdef CONFIG_MODULES
/*
* Assuming:
*
@@ -156,5 +155,3 @@ int __request_module(bool wait, const ch
return ret;
}
EXPORT_SYMBOL(__request_module);
-
-#endif /* CONFIG_MODULES */
_
Patches currently in -mm which might be from mcgrof@xxxxxxxxxx are
test_kmod-fix-bug-which-allows-negative-values-on-two-config-options.patch
kmod-split-out-umh-code-into-its-own-file.patch
maintainers-clarify-kmod-is-just-a-kernel-module-loader.patch
kmod-split-off-umh-headers-into-its-own-file.patch
kmod-move-ifdef-config_modules-wrapper-to-makefile.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
