Skip to content

Commit 380b654

Browse files
Paul Gortmakergregkh
authored andcommitted
drivers/staging: make android lowmemorykiller.c explicitly non-modular
The Kconfig currently controlling compilation of this code is: drivers/staging/android/Kconfig:config ANDROID_LOW_MEMORY_KILLER drivers/staging/android/Kconfig: bool "Android Low Memory Killer" ...meaning that it currently is not being built as a module by anyone. Lets remove the modular code that is essentially orphaned, so that when reading the driver 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. We replace module.h with init.h and moduleparam.h ; the latter since this file was previously implicitly relying on getting that header. We also delete the MODULE_LICENSE tag etc. since all that information is already contained at the top of the file in the comments. Cc: "Arve Hjønnevåg" <arve@android.com> Cc: Riley Andrews <riandrews@android.com> Cc: devel@driverdev.osuosl.org Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent db1ad33 commit 380b654

File tree

1 file changed

+7
-11
lines changed

1 file changed

+7
-11
lines changed

drivers/staging/android/lowmemorykiller.c

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,8 @@
3232

3333
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
3434

35-
#include <linux/module.h>
35+
#include <linux/init.h>
36+
#include <linux/moduleparam.h>
3637
#include <linux/kernel.h>
3738
#include <linux/mm.h>
3839
#include <linux/oom.h>
@@ -190,21 +191,16 @@ static int __init lowmem_init(void)
190191
register_shrinker(&lowmem_shrinker);
191192
return 0;
192193
}
194+
device_initcall(lowmem_init);
193195

194-
static void __exit lowmem_exit(void)
195-
{
196-
unregister_shrinker(&lowmem_shrinker);
197-
}
198-
196+
/*
197+
* not really modular, but the easiest way to keep compat with existing
198+
* bootargs behaviour is to continue using module_param here.
199+
*/
199200
module_param_named(cost, lowmem_shrinker.seeks, int, S_IRUGO | S_IWUSR);
200201
module_param_array_named(adj, lowmem_adj, short, &lowmem_adj_size,
201202
S_IRUGO | S_IWUSR);
202203
module_param_array_named(minfree, lowmem_minfree, uint, &lowmem_minfree_size,
203204
S_IRUGO | S_IWUSR);
204205
module_param_named(debug_level, lowmem_debug_level, uint, S_IRUGO | S_IWUSR);
205206

206-
module_init(lowmem_init);
207-
module_exit(lowmem_exit);
208-
209-
MODULE_LICENSE("GPL");
210-

0 commit comments

Comments
 (0)