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,
atomlin@atomlin.com, ghalat@redhat.com
Subject: [RFC PATCH 01/12] module: Move all into module/
Date: Tue, 28 Dec 2021 21:30:30 +0000 [thread overview]
Message-ID: <20211228213041.1356334-2-atomlin@redhat.com> (raw)
In-Reply-To: <20211228213041.1356334-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>
---
kernel/Makefile | 4 +---
kernel/module/Makefile | 8 ++++++++
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 +-
6 files changed, 11 insertions(+), 5 deletions(-)
create mode 100644 kernel/module/Makefile
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/kernel/Makefile b/kernel/Makefile
index 4df609be42d0..466477d4dafe 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,9 +67,6 @@ ifneq ($(CONFIG_SMP),y)
obj-y += up.o
endif
obj-$(CONFIG_UID16) += uid16.o
-obj-$(CONFIG_MODULES) += module.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..a9cf6e822075
--- /dev/null
+++ b/kernel/module/Makefile
@@ -0,0 +1,8 @@
+# SPDX-License-Identifier: GPL-2.0-only
+#
+# Makefile for linux kernel module support
+#
+
+obj-$(CONFIG_MODULES) += main.o
+obj-$(CONFIG_MODULE_SIG) += signing.o
+obj-$(CONFIG_MODULE_SIG_FORMAT) += signature.o
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 ed13917ea5f3..bc997c3e2c95 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.31.1
next prev parent reply other threads:[~2021-12-28 21:30 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-24 17:33 [RFC PATCH] module: Introduce module unload taint tracking Aaron Tomlin
2021-12-08 20:47 ` Luis Chamberlain
2021-12-09 16:49 ` Aaron Tomlin
2021-12-09 23:42 ` Luis Chamberlain
2021-12-10 10:00 ` Petr Mladek
2021-12-10 16:09 ` Aaron Tomlin
2021-12-10 17:09 ` Luis Chamberlain
2021-12-13 15:16 ` Petr Mladek
2021-12-21 11:58 ` Aaron Tomlin
2021-12-10 17:03 ` Luis Chamberlain
2021-12-10 15:48 ` Aaron Tomlin
2021-12-28 21:30 ` [RFC PATCH 00/12] module: core code clean up Aaron Tomlin
2021-12-28 21:30 ` Aaron Tomlin [this message]
2021-12-28 21:30 ` [RFC PATCH 02/12] module: Simple refactor in preparation for split Aaron Tomlin
2021-12-28 21:30 ` [RFC PATCH 03/12] module: Move livepatch support to a separate file Aaron Tomlin
2021-12-28 21:30 ` [RFC PATCH 04/12] module: Move latched RB-tree " Aaron Tomlin
2021-12-28 21:30 ` [RFC PATCH 05/12] module: Move arch strict rwx " Aaron Tomlin
2022-01-12 16:13 ` Luis Chamberlain
2021-12-28 21:30 ` [RFC PATCH 06/12] module: Move " Aaron Tomlin
2021-12-28 21:30 ` [RFC PATCH 07/12] module: Move extra signature support out of core code Aaron Tomlin
2021-12-28 21:30 ` [RFC PATCH 08/12] module: Move kmemleak support to a separate file Aaron Tomlin
2021-12-28 21:30 ` [RFC PATCH 09/12] module: Move kallsyms support into " Aaron Tomlin
2021-12-28 21:30 ` [RFC PATCH 10/12] module: Move procfs " Aaron Tomlin
2021-12-28 21:30 ` [RFC PATCH 11/12] module: Move sysfs " Aaron Tomlin
2022-01-12 16:20 ` Luis Chamberlain
2021-12-28 21:30 ` [RFC PATCH 12/12] module: Move kdb_modules list out of core code Aaron Tomlin
2021-12-29 8:58 ` [RFC PATCH 00/12] module: core code clean up Aaron Tomlin
2022-01-12 16:21 ` Luis Chamberlain
2021-12-13 13:00 ` [RFC PATCH] module: Introduce module unload taint tracking Allen
2021-12-20 19:23 ` Luis Chamberlain
2021-12-21 11:44 ` 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=20211228213041.1356334-2-atomlin@redhat.com \
--to=atomlin@redhat.com \
--cc=akpm@linux-foundation.org \
--cc=atomlin@atomlin.com \
--cc=cl@linux.com \
--cc=ghalat@redhat.com \
--cc=jeyu@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-modules@vger.kernel.org \
--cc=mbenes@suse.cz \
--cc=mcgrof@kernel.org \
--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).