Thread (32 messages) 32 messages, 5 authors, 2022-02-23

Re: [PATCH v6 01/13] module: Move all into module/

From: Christophe Leroy <hidden>
Date: 2022-02-21 13:13:10
Also in: live-patching, lkml


Le 18/02/2022 à 22:24, Aaron Tomlin a écrit :
quoted hunk ↗ jump to hunk
No functional changes.

This patch moves all module related code into a separate directory,
modifies each file name and creates a new Makefile. Note: this effort
is in preparation to refactor core module code.

Signed-off-by: Aaron Tomlin <redacted>
---
  MAINTAINERS                                         | 2 +-
  kernel/Makefile                                     | 5 +----
  kernel/module/Makefile                              | 9 +++++++++
  kernel/{module_decompress.c => module/decompress.c} | 2 +-
  kernel/{module-internal.h => module/internal.h}     | 0
  kernel/{module.c => module/main.c}                  | 2 +-
  kernel/{module_signature.c => module/signature.c}   | 0
  kernel/{module_signing.c => module/signing.c}       | 2 +-
  8 files changed, 14 insertions(+), 8 deletions(-)
  create mode 100644 kernel/module/Makefile
  rename kernel/{module_decompress.c => module/decompress.c} (99%)
  rename kernel/{module-internal.h => module/internal.h} (100%)
  rename kernel/{module.c => module/main.c} (99%)
  rename kernel/{module_signature.c => module/signature.c} (100%)
  rename kernel/{module_signing.c => module/signing.c} (97%)
diff --git a/MAINTAINERS b/MAINTAINERS
index bd86ed9fbc79..463bdb829db4 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -13012,7 +13012,7 @@ L:	linux-kernel@vger.kernel.org
  S:	Maintained
  T:	git git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git modules-next
  F:	include/linux/module.h
-F:	kernel/module.c
+F:	kernel/module/
  
  MONOLITHIC POWER SYSTEM PMIC DRIVER
  M:	Saravanan Sekar <sravanhome@gmail.com>
diff --git a/kernel/Makefile b/kernel/Makefile
index 56f4ee97f328..3a6380975c57 100644
--- a/kernel/Makefile
+++ b/kernel/Makefile
This file also contains:

KCOV_INSTRUMENT_module.o := n

It needs to follow through into kernel/module/Makefile, with a copy of 
the comment. And then it needs to be taken care of while dismantling main.c

quoted hunk ↗ jump to hunk
@@ -53,6 +53,7 @@ obj-y += rcu/
  obj-y += livepatch/
  obj-y += dma/
  obj-y += entry/
+obj-y += module/
  
  obj-$(CONFIG_KCMP) += kcmp.o
  obj-$(CONFIG_FREEZER) += freezer.o
@@ -66,10 +67,6 @@ ifneq ($(CONFIG_SMP),y)
  obj-y += up.o
  endif
  obj-$(CONFIG_UID16) += uid16.o
-obj-$(CONFIG_MODULES) += module.o
-obj-$(CONFIG_MODULE_DECOMPRESS) += module_decompress.o
-obj-$(CONFIG_MODULE_SIG) += module_signing.o
-obj-$(CONFIG_MODULE_SIG_FORMAT) += module_signature.o
  obj-$(CONFIG_KALLSYMS) += kallsyms.o
  obj-$(CONFIG_BSD_PROCESS_ACCT) += acct.o
  obj-$(CONFIG_CRASH_CORE) += crash_core.o
diff --git a/kernel/module/Makefile b/kernel/module/Makefile
new file mode 100644
index 000000000000..2902fc7d0ef1
--- /dev/null
+++ b/kernel/module/Makefile
@@ -0,0 +1,9 @@
+# SPDX-License-Identifier: GPL-2.0-only
+#
+# Makefile for linux kernel module support
+#
+
+obj-$(CONFIG_MODULES) += main.o
+obj-$(CONFIG_MODULE_DECOMPRESS) += decompress.o
+obj-$(CONFIG_MODULE_SIG) += signing.o
+obj-$(CONFIG_MODULE_SIG_FORMAT) += signature.o
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help