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

Groups > linux.kernel > #1212557

[PATCH 06/10] mm: make vmstat.c explicitly non-modular

Show all headers | View raw

The Makefile currently controlling compilation of this code is obj-y
meaning that it currently is not 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. However
one could argue that subsys_initcall might make more sense here.

Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Christoph Lameter <cl@linux.com>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: Mel Gorman <mgorman@suse.de>
Cc: Michal Hocko <mhocko@suse.cz>
Cc: Davidlohr Bueso <dave@stgolabs.net>
Cc: Minchan Kim <minchan@kernel.org>
Cc: Joonsoo Kim <iamjoonsoo.kim@lge.com>
Cc: linux-mm@kvack.org
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
---
 mm/vmstat.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/mm/vmstat.c b/mm/vmstat.c
index 1fd0886a389f..e6cd18cc4d75 100644
--- a/mm/vmstat.c
+++ b/mm/vmstat.c
@@ -12,7 +12,7 @@
 #include <linux/fs.h>
 #include <linux/mm.h>
 #include <linux/err.h>
-#include <linux/module.h>
+#include <linux/init.h>
 #include <linux/slab.h>
 #include <linux/cpu.h>
 #include <linux/cpumask.h>
@@ -1536,7 +1536,7 @@ static int __init setup_vmstat(void)
 #endif
 	return 0;
 }
-module_init(setup_vmstat)
+device_initcall(setup_vmstat)
 
 #if defined(CONFIG_DEBUG_FS) && defined(CONFIG_COMPACTION)
 
@@ -1695,6 +1695,5 @@ fail:
 	debugfs_remove_recursive(extfrag_debug_root);
 	return -ENOMEM;
 }
-
-module_init(extfrag_debug_init);
+device_initcall(extfrag_debug_init);
 #endif
-- 
2.5.0

--
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 00/10] mm: fix instances of non-modular code using modular fcns Paul Gortmaker <paul.gortmaker@windriver.com> - 2015-08-25 00:20 +0200
  [PATCH 04/10] mm: make vmscan.c explicitly non-modular Paul Gortmaker <paul.gortmaker@windriver.com> - 2015-08-25 00:20 +0200
  [PATCH 05/10] mm: make page_alloc.c explicitly non-modular Paul Gortmaker <paul.gortmaker@windriver.com> - 2015-08-25 00:20 +0200
  [PATCH 03/10] mm: make hugetlb.c explicitly non-modular Paul Gortmaker <paul.gortmaker@windriver.com> - 2015-08-25 00:20 +0200
    Re: [PATCH 03/10] mm: make hugetlb.c explicitly non-modular Mike Kravetz <mike.kravetz@oracle.com> - 2015-08-26 18:50 +0200
  [PATCH 06/10] mm: make vmstat.c explicitly non-modular Paul Gortmaker <paul.gortmaker@windriver.com> - 2015-08-25 00:20 +0200

csiph-web