Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4ff1b2c2 authored Dec 12, 2012 by Lai Jiangshan Committed by Linus Torvalds Dec 12, 2012

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>

parent 38d7bee9

fs/proc/kcore.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -249,7 +249,7 @@ static int kcore_update_ram(void)
		/* Not inialized....update now */
		/* find out "max pfn" */
		end_pfn = 0;
		for_each_node_state(nid, N_HIGH_MEMORY) {
		for_each_node_state(nid, N_MEMORY) {
		unsigned long node_end;
		node_end = NODE_DATA(nid)->node_start_pfn +
		NODE_DATA(nid)->node_spanned_pages;

fs/proc/task_mmu.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -1126,7 +1126,7 @@ static struct page can_gather_numa_stats(pte_t pte, struct vm_area_struct vma,
		return NULL;

		nid = page_to_nid(page);
		if (!node_isset(nid, node_states[N_HIGH_MEMORY]))
		if (!node_isset(nid, node_states[N_MEMORY]))
		return NULL;

		return page;
		@@ -1279,7 +1279,7 @@ static int show_numa_map(struct seq_file m, void v, int is_pid)
		if (md->writeback)
		seq_printf(m, " writeback=%lu", md->writeback);

		for_each_node_state(n, N_HIGH_MEMORY)
		for_each_node_state(n, N_MEMORY)
		if (md->node[n])
		seq_printf(m, " N%d=%lu", n, md->node[n]);
		out: