diff options
author | Greg Kroah-Hartman <gregkh@suse.de> | 2009-05-11 20:00:41 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-06-19 14:00:52 -0400 |
commit | 1dbb5765acc7a6fe4bc1957c001037cc9d02ae03 (patch) | |
tree | ef19bf9618874fc50c7729fd0d92db56e3da258c | |
parent | 241e12879be74fdfadf3abc820a2e3c455599c3c (diff) |
Staging: android: lowmemorykiller: fix up remaining checkpatch warnings
This cleans up the last of the checkpatch warnings in the android
lowmemorykiller driver.
Cc: San Mehat <san@android.com>
Cc: Arve Hjønnevåg <arve@android.com>
Cc: David Rientjes <rientjes@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r-- | drivers/staging/android/lowmemorykiller.c | 26 |
1 files changed, 16 insertions, 10 deletions
diff --git a/drivers/staging/android/lowmemorykiller.c b/drivers/staging/android/lowmemorykiller.c index cba3b91d728e..fe72240f5a9e 100644 --- a/drivers/staging/android/lowmemorykiller.c +++ b/drivers/staging/android/lowmemorykiller.c | |||
@@ -34,18 +34,24 @@ static int lowmem_adj[6] = { | |||
34 | }; | 34 | }; |
35 | static int lowmem_adj_size = 4; | 35 | static int lowmem_adj_size = 4; |
36 | static size_t lowmem_minfree[6] = { | 36 | static size_t lowmem_minfree[6] = { |
37 | 3*512, // 6MB | 37 | 3 * 512, /* 6MB */ |
38 | 2*1024, // 8MB | 38 | 2 * 1024, /* 8MB */ |
39 | 4*1024, // 16MB | 39 | 4 * 1024, /* 16MB */ |
40 | 16*1024, // 64MB | 40 | 16 * 1024, /* 64MB */ |
41 | }; | 41 | }; |
42 | static int lowmem_minfree_size = 4; | 42 | static int lowmem_minfree_size = 4; |
43 | 43 | ||
44 | #define lowmem_print(level, x...) do { if(lowmem_debug_level >= (level)) printk(x); } while(0) | 44 | #define lowmem_print(level, x...) \ |
45 | do { \ | ||
46 | if (lowmem_debug_level >= (level)) \ | ||
47 | printk(x); \ | ||
48 | } while (0) | ||
45 | 49 | ||
46 | module_param_named(cost, lowmem_shrinker.seeks, int, S_IRUGO | S_IWUSR); | 50 | module_param_named(cost, lowmem_shrinker.seeks, int, S_IRUGO | S_IWUSR); |
47 | module_param_array_named(adj, lowmem_adj, int, &lowmem_adj_size, S_IRUGO | S_IWUSR); | 51 | module_param_array_named(adj, lowmem_adj, int, &lowmem_adj_size, |
48 | module_param_array_named(minfree, lowmem_minfree, uint, &lowmem_minfree_size, S_IRUGO | S_IWUSR); | 52 | S_IRUGO | S_IWUSR); |
53 | module_param_array_named(minfree, lowmem_minfree, uint, &lowmem_minfree_size, | ||
54 | S_IRUGO | S_IWUSR); | ||
49 | module_param_named(debug_level, lowmem_debug_level, uint, S_IRUGO | S_IWUSR); | 55 | module_param_named(debug_level, lowmem_debug_level, uint, S_IRUGO | S_IWUSR); |
50 | 56 | ||
51 | static int lowmem_shrink(int nr_to_scan, gfp_t gfp_mask) | 57 | static int lowmem_shrink(int nr_to_scan, gfp_t gfp_mask) |
@@ -117,12 +123,12 @@ static int lowmem_shrink(int nr_to_scan, gfp_t gfp_mask) | |||
117 | selected_tasksize = tasksize; | 123 | selected_tasksize = tasksize; |
118 | selected_oom_adj = oom_adj; | 124 | selected_oom_adj = oom_adj; |
119 | lowmem_print(2, "select %d (%s), adj %d, size %d, to kill\n", | 125 | lowmem_print(2, "select %d (%s), adj %d, size %d, to kill\n", |
120 | p->pid, p->comm, oom_adj, tasksize); | 126 | p->pid, p->comm, oom_adj, tasksize); |
121 | } | 127 | } |
122 | if (selected) { | 128 | if (selected) { |
123 | lowmem_print(1, "send sigkill to %d (%s), adj %d, size %d\n", | 129 | lowmem_print(1, "send sigkill to %d (%s), adj %d, size %d\n", |
124 | selected->pid, selected->comm, | 130 | selected->pid, selected->comm, |
125 | selected_oom_adj, selected_tasksize); | 131 | selected_oom_adj, selected_tasksize); |
126 | force_sig(SIGKILL, selected); | 132 | force_sig(SIGKILL, selected); |
127 | rem -= selected_tasksize; | 133 | rem -= selected_tasksize; |
128 | } | 134 | } |