Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1212820

[tip:x86/mm] x86/mm/pat: Make mm/pageattr[-test] .c explicitly non-modular

Show all headers | View raw

Commit-ID:  8f45fe441a9836011672436ef007654969b28ccc
Gitweb:     http://git.kernel.org/tip/8f45fe441a9836011672436ef007654969b28ccc
Author:     Paul Gortmaker <paul.gortmaker@windriver.com>
AuthorDate: Mon, 24 Aug 2015 19:34:54 -0400
Committer:  Ingo Molnar <mingo@kernel.org>
CommitDate: Tue, 25 Aug 2015 09:48:38 +0200

x86/mm/pat: Make mm/pageattr[-test].c explicitly non-modular

The file pageattr.c is obj-y and it includes pageattr-test.c
based on CPA_DEBUG (a bool), meaning that no code here is
currently being built as a module by anyone.

Lets remove the couple traces of modularity so that when reading
the code there is no doubt it is builtin-only.

Since module_init translates to device_initcall in the
non-modular case, the init ordering remains unchanged with this
commit.

Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: http://lkml.kernel.org/r/1440459295-21814-3-git-send-email-paul.gortmaker@windriver.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
 arch/x86/mm/pageattr-test.c | 4 ++--
 arch/x86/mm/pageattr.c      | 1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/arch/x86/mm/pageattr-test.c b/arch/x86/mm/pageattr-test.c
index 8ff686a..5f169d5 100644
--- a/arch/x86/mm/pageattr-test.c
+++ b/arch/x86/mm/pageattr-test.c
@@ -8,6 +8,7 @@
 #include <linux/kthread.h>
 #include <linux/random.h>
 #include <linux/kernel.h>
+#include <linux/init.h>
 #include <linux/mm.h>
 #include <linux/vmalloc.h>
 
@@ -256,5 +257,4 @@ static int start_pageattr_test(void)
 
 	return 0;
 }
-
-module_init(start_pageattr_test);
+device_initcall(start_pageattr_test);
diff --git a/arch/x86/mm/pageattr.c b/arch/x86/mm/pageattr.c
index 727158c..2c44c07 100644
--- a/arch/x86/mm/pageattr.c
+++ b/arch/x86/mm/pageattr.c
@@ -4,7 +4,6 @@
  */
 #include <linux/highmem.h>
 #include <linux/bootmem.h>
-#include <linux/module.h>
 #include <linux/sched.h>
 #include <linux/mm.h>
 #include <linux/interrupt.h>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | Next — Previous in thread | Find similar | Unroll thread

Thread

[PATCH 2/3] arch/x86: make mm/pageattr[-test].c explicitly non-modular Paul Gortmaker <paul.gortmaker@windriver.com> - 2015-08-25 01:40 +0200
  [tip:x86/mm] x86/mm/pat: Make mm/pageattr[-test]  .c explicitly non-modular tip-bot for Paul Gortmaker <tipbot@zytor.com> - 2015-08-25 10:30 +0200

csiph-web