Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 4ff1b2c29326a2a3e130b46f69b7ab0e853d09d8

Authored by Lai Jiangshan
Committed by Linus Torvalds
1 parent 38d7bee9d2
Exists in smarc-l5.0.0_1.0.0-ga and in 5 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga

procfs: 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: 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>

Showing 2 changed files with 3 additions and 3 deletions Side-by-side Diff

... ... @@ -249,7 +249,7 @@
249 249 /* Not inialized....update now */
250 250 /* find out "max pfn" */
251 251 end_pfn = 0;
252   - for_each_node_state(nid, N_HIGH_MEMORY) {
  252 + for_each_node_state(nid, N_MEMORY) {
253 253 unsigned long node_end;
254 254 node_end = NODE_DATA(nid)->node_start_pfn +
255 255 NODE_DATA(nid)->node_spanned_pages;
... ... @@ -1126,7 +1126,7 @@
1126 1126 return NULL;
1127 1127  
1128 1128 nid = page_to_nid(page);
1129   - if (!node_isset(nid, node_states[N_HIGH_MEMORY]))
  1129 + if (!node_isset(nid, node_states[N_MEMORY]))
1130 1130 return NULL;
1131 1131  
1132 1132 return page;
... ... @@ -1279,7 +1279,7 @@
1279 1279 if (md->writeback)
1280 1280 seq_printf(m, " writeback=%lu", md->writeback);
1281 1281  
1282   - for_each_node_state(n, N_HIGH_MEMORY)
  1282 + for_each_node_state(n, N_MEMORY)
1283 1283 if (md->node[n])
1284 1284 seq_printf(m, " N%d=%lu", n, md->node[n]);
1285 1285 out: