Skip to contentSkip to conversation

kmod-move-ifdef-config_modules-wrapper-to-makefile.patch removed from -mm tree

merged [email protected] 1 participant 1 message Sep 11, 2017

lore
Share & tools
lore

[email protected]

author tree notice Applied
#0 lore raw

The patch titled
Subject: kmod: move #ifdef CONFIG_MODULES wrapper to Makefile
has been removed from the -mm tree. Its filename was
kmod-move-ifdef-config_modules-wrapper-to-makefile.patch

This patch was dropped because it was merged into mainline or a subsystem tree

------------------------------------------------------
From: "Luis R. Rodriguez" <[email protected]>
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.

Cc Kees Cook <[email protected]>
Cc Dmitry Torokhov <[email protected]>
Cc Jessica Yu <[email protected]>
Cc Rusty Russell <[email protected]>
Cc Michal Marek <[email protected]>
Cc Petr Mladek <[email protected]>
Cc Miroslav Benes <[email protected]>
Cc Josh Poimboeuf <[email protected]>
Cc Guenter Roeck <[email protected]>
Cc "Eric W. Biederman" <[email protected]>
Cc Matt Redfearn <[email protected]>
Cc Dan Carpenter <[email protected]>
Cc Colin Ian King <[email protected]>
Cc Daniel Mentz <[email protected]>
Cc David Binderman <[email protected]>
Cc Greg Kroah-Hartman <[email protected]>

---

 kernel/Makefile |    3 ++-
 kernel/kmod.c   |    3 ---
 2 files changed, 2 insertions(+), 4 deletions(-)
kernel/Makefile renamed from kernel/Makefile~kmod-move-ifdef-config_modules-wrapper-to-makefile +2 -1
diff -puN kernel/Makefile~kmod-move-ifdef-config_modules-wrapper-to-makefile 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
kernel/kmod.c renamed from kernel/kmod.c~kmod-move-ifdef-config_modules-wrapper-to-makefile +0 -1
diff -puN kernel/kmod.c~kmod-move-ifdef-config_modules-wrapper-to-makefile kernel/kmod.c
@@ -28,7 +28,6 @@
 
 #include <trace/events/module.h>
 
-#ifdef CONFIG_MODULES
 /*
  * Assuming:
  *
@@ -177,5 +176,3 @@ int __request_module(bool wait, const ch
 	return ret;
 }
 EXPORT_SYMBOL(__request_module);