From: Aaron Tomlin <atomlin@redhat.com>
To: mcgrof@kernel.org
Cc: cl@linux.com, pmladek@suse.com, mbenes@suse.cz,
akpm@linux-foundation.org, jeyu@kernel.org,
linux-kernel@vger.kernel.org, linux-modules@vger.kernel.org,
live-patching@vger.kernel.org, atomlin@atomlin.com,
ghalat@redhat.com, allen.lkml@gmail.com, joe@perches.com,
christophe.leroy@csgroup.eu, msuchanek@suse.de,
oleksandr@natalenko.name
Subject: [PATCH v6 01/13] module: Move all into module/
Date: Fri, 18 Feb 2022 21:24:59 +0000 [thread overview]
Message-ID: <20220218212511.887059-2-atomlin@redhat.com> (raw)
In-Reply-To: <20220218212511.887059-1-atomlin@redhat.com>
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 <atomlin@redhat.com>
---
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
@@ -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
diff --git a/kernel/module_decompress.c b/kernel/module/decompress.c
similarity index 99%
rename from kernel/module_decompress.c
rename to kernel/module/decompress.c
index ffef98a20320..d14d6443225a 100644
--- a/kernel/module_decompress.c
+++ b/kernel/module/decompress.c
@@ -12,7 +12,7 @@
#include <linux/sysfs.h>
#include <linux/vmalloc.h>
-#include "module-internal.h"
+#include "internal.h"
static int module_extend_max_pages(struct load_info *info, unsigned int extent)
{
diff --git a/kernel/module-internal.h b/kernel/module/internal.h
similarity index 100%
rename from kernel/module-internal.h
rename to kernel/module/internal.h
diff --git a/kernel/module.c b/kernel/module/main.c
similarity index 99%
rename from kernel/module.c
rename to kernel/module/main.c
index 46a5c2ed1928..34a2b0cf3c3e 100644
--- a/kernel/module.c
+++ b/kernel/module/main.c
@@ -58,7 +58,7 @@
#include <linux/dynamic_debug.h>
#include <linux/audit.h>
#include <uapi/linux/module.h>
-#include "module-internal.h"
+#include "internal.h"
#define CREATE_TRACE_POINTS
#include <trace/events/module.h>
diff --git a/kernel/module_signature.c b/kernel/module/signature.c
similarity index 100%
rename from kernel/module_signature.c
rename to kernel/module/signature.c
diff --git a/kernel/module_signing.c b/kernel/module/signing.c
similarity index 97%
rename from kernel/module_signing.c
rename to kernel/module/signing.c
index 8723ae70ea1f..8aeb6d2ee94b 100644
--- a/kernel/module_signing.c
+++ b/kernel/module/signing.c
@@ -12,7 +12,7 @@
#include <linux/string.h>
#include <linux/verification.h>
#include <crypto/public_key.h>
-#include "module-internal.h"
+#include "internal.h"
/*
* Verify the signature on a module.
--
2.34.1
next prev parent reply other threads:[~2022-02-18 21:25 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-02-18 21:24 [PATCH v6 00/13] module: core code clean up Aaron Tomlin
2022-02-18 21:24 ` Aaron Tomlin [this message]
2022-02-21 12:21 ` [PATCH v6 01/13] module: Move all into module/ Christophe Leroy
2022-02-22 10:48 ` Aaron Tomlin
2022-02-23 1:16 ` Luis Chamberlain
2022-02-23 16:57 ` Aaron Tomlin
2022-02-21 13:13 ` Christophe Leroy
2022-02-18 21:25 ` [PATCH v6 02/13] module: Simple refactor in preparation for split Aaron Tomlin
2022-02-18 21:25 ` [PATCH v6 03/13] module: Make internal.h and decompress.c more compliant Aaron Tomlin
2022-02-18 21:25 ` [PATCH v6 04/13] module: Move livepatch support to a separate file Aaron Tomlin
2022-02-18 21:25 ` [PATCH v6 05/13] module: Move latched RB-tree " Aaron Tomlin
2022-02-21 10:57 ` Christophe Leroy
2022-02-18 21:25 ` [PATCH v6 06/13] module: Move strict rwx " Aaron Tomlin
2022-02-21 6:31 ` Christophe Leroy
2022-02-21 9:35 ` Aaron Tomlin
2022-02-21 11:27 ` Christophe Leroy
2022-02-21 16:15 ` Christophe Leroy
2022-02-18 21:25 ` [PATCH v6 07/13] module: Move extra signature support out of core code Aaron Tomlin
2022-02-18 21:25 ` [PATCH v6 08/13] module: Move kmemleak support to a separate file Aaron Tomlin
2022-02-18 21:25 ` [PATCH v6 09/13] module: Move kallsyms support into " Aaron Tomlin
2022-02-21 8:15 ` Christophe Leroy
2022-02-21 8:35 ` Christophe Leroy
2022-02-21 9:22 ` Aaron Tomlin
2022-02-22 9:58 ` Miroslav Benes
2022-02-21 9:21 ` Aaron Tomlin
2022-02-21 10:49 ` Christophe Leroy
2022-02-21 12:02 ` Aaron Tomlin
2022-02-18 21:25 ` [PATCH v6 10/13] module: Move procfs " Aaron Tomlin
2022-02-19 2:12 ` [PATCH v6 00/13] module: core code clean up Luis Chamberlain
2022-02-21 12:47 ` Miroslav Benes
2022-02-22 10:58 ` Christophe Leroy
2022-02-22 11:18 ` Aaron Tomlin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220218212511.887059-2-atomlin@redhat.com \
--to=atomlin@redhat.com \
--cc=akpm@linux-foundation.org \
--cc=allen.lkml@gmail.com \
--cc=atomlin@atomlin.com \
--cc=christophe.leroy@csgroup.eu \
--cc=cl@linux.com \
--cc=ghalat@redhat.com \
--cc=jeyu@kernel.org \
--cc=joe@perches.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-modules@vger.kernel.org \
--cc=live-patching@vger.kernel.org \
--cc=mbenes@suse.cz \
--cc=mcgrof@kernel.org \
--cc=msuchanek@suse.de \
--cc=oleksandr@natalenko.name \
--cc=pmladek@suse.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).