aboutsummaryrefslogtreecommitdiffstats
path: root/mm
diff options
context:
space:
mode:
authorLai Jiangshan <laijs@cn.fujitsu.com>2012-12-12 16:51:43 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2012-12-12 20:38:33 -0500
commit48fb2e240c4275c6ba4f53c9397f5fd6f350c3a7 (patch)
treecc2dd2da3b9c7b87ec870e1c9011c2c6876635ed /mm
parent3c466d46a9f38de141d8a492d8b1b1d0fa504759 (diff)
vmscan: use N_MEMORY instead N_HIGH_MEMORY
N_HIGH_MEMORY stands for the nodes that has normal or high memory. N_MEMORY stands for the nodes that has any memory. The code here need to handle with the nodes which have memory, we should use N_MEMORY instead. Signed-off-by: Lai Jiangshan <laijs@cn.fujitsu.com> Acked-by: Hillf Danton <dhillf@gmail.com> Signed-off-by: Wen Congyang <wency@cn.fujitsu.com> Cc: Christoph Lameter <cl@linux.com> Cc: Hillf Danton <dhillf@gmail.com> Cc: Lin Feng <linfeng@cn.fujitsu.com> Cc: David Rientjes <rientjes@google.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'mm')
-rw-r--r--mm/vmscan.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/mm/vmscan.c b/mm/vmscan.c
index 157bb116dec8..7f3096137b8a 100644
--- a/mm/vmscan.c
+++ b/mm/vmscan.c
@@ -3131,7 +3131,7 @@ static int __devinit cpu_callback(struct notifier_block *nfb,
3131 int nid; 3131 int nid;
3132 3132
3133 if (action == CPU_ONLINE || action == CPU_ONLINE_FROZEN) { 3133 if (action == CPU_ONLINE || action == CPU_ONLINE_FROZEN) {
3134 for_each_node_state(nid, N_HIGH_MEMORY) { 3134 for_each_node_state(nid, N_MEMORY) {
3135 pg_data_t *pgdat = NODE_DATA(nid); 3135 pg_data_t *pgdat = NODE_DATA(nid);
3136 const struct cpumask *mask; 3136 const struct cpumask *mask;
3137 3137
@@ -3187,7 +3187,7 @@ static int __init kswapd_init(void)
3187 int nid; 3187 int nid;
3188 3188
3189 swap_setup(); 3189 swap_setup();
3190 for_each_node_state(nid, N_HIGH_MEMORY) 3190 for_each_node_state(nid, N_MEMORY)
3191 kswapd_run(nid); 3191 kswapd_run(nid);
3192 hotcpu_notifier(cpu_callback, 0); 3192 hotcpu_notifier(cpu_callback, 0);
3193 return 0; 3193 return 0;