diff options
author | Lai Jiangshan <laijs@cn.fujitsu.com> | 2012-12-12 16:51:25 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-12-12 20:38:32 -0500 |
commit | 4ff1b2c29326a2a3e130b46f69b7ab0e853d09d8 (patch) | |
tree | e5df1265586c331e299a9a57151d3f59f255a079 /fs | |
parent | 38d7bee9d24adf4c95676a3dc902827c72930ebb (diff) |
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>
Diffstat (limited to 'fs')
-rw-r--r-- | fs/proc/kcore.c | 2 | ||||
-rw-r--r-- | fs/proc/task_mmu.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/fs/proc/kcore.c b/fs/proc/kcore.c index 86c67eee439f..e96d4f18ca3a 100644 --- a/fs/proc/kcore.c +++ b/fs/proc/kcore.c | |||
@@ -249,7 +249,7 @@ static int kcore_update_ram(void) | |||
249 | /* Not inialized....update now */ | 249 | /* Not inialized....update now */ |
250 | /* find out "max pfn" */ | 250 | /* find out "max pfn" */ |
251 | end_pfn = 0; | 251 | end_pfn = 0; |
252 | for_each_node_state(nid, N_HIGH_MEMORY) { | 252 | for_each_node_state(nid, N_MEMORY) { |
253 | unsigned long node_end; | 253 | unsigned long node_end; |
254 | node_end = NODE_DATA(nid)->node_start_pfn + | 254 | node_end = NODE_DATA(nid)->node_start_pfn + |
255 | NODE_DATA(nid)->node_spanned_pages; | 255 | NODE_DATA(nid)->node_spanned_pages; |
diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c index 291a0d15a0be..48775628abbf 100644 --- a/fs/proc/task_mmu.c +++ b/fs/proc/task_mmu.c | |||
@@ -1126,7 +1126,7 @@ static struct page *can_gather_numa_stats(pte_t pte, struct vm_area_struct *vma, | |||
1126 | return NULL; | 1126 | return NULL; |
1127 | 1127 | ||
1128 | nid = page_to_nid(page); | 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 | return NULL; | 1130 | return NULL; |
1131 | 1131 | ||
1132 | return page; | 1132 | return page; |
@@ -1279,7 +1279,7 @@ static int show_numa_map(struct seq_file *m, void *v, int is_pid) | |||
1279 | if (md->writeback) | 1279 | if (md->writeback) |
1280 | seq_printf(m, " writeback=%lu", md->writeback); | 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 | if (md->node[n]) | 1283 | if (md->node[n]) |
1284 | seq_printf(m, " N%d=%lu", n, md->node[n]); | 1284 | seq_printf(m, " N%d=%lu", n, md->node[n]); |
1285 | out: | 1285 | out: |