Fix node_start/end_pfn() definition for mm/page_cgroup.c
authorKAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Thu, 16 Jun 2011 08:28:07 +0000 (17:28 +0900)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 27 Jun 2011 21:13:09 +0000 (14:13 -0700)
commitc6830c22603aaecf65405af23f6da2d55892f9cb
tree19458ebc7c32bef8a4ed59630cabb5785b1bdc11
parentaf4087e0e682df12bdffec5cfafc2fec9208716e
Fix node_start/end_pfn() definition for mm/page_cgroup.c

commit 21a3c96 uses node_start/end_pfn(nid) for detection start/end
of nodes. But, it's not defined in linux/mmzone.h but defined in
/arch/???/include/mmzone.h which is included only under
CONFIG_NEED_MULTIPLE_NODES=y.

Then, we see
  mm/page_cgroup.c: In function 'page_cgroup_init':
  mm/page_cgroup.c:308: error: implicit declaration of function 'node_start_pfn'
  mm/page_cgroup.c:309: error: implicit declaration of function 'node_end_pfn'

So, fixiing page_cgroup.c is an idea...

But node_start_pfn()/node_end_pfn() is a very generic macro and
should be implemented in the same manner for all archs.
(m32r has different implementation...)

This patch removes definitions of node_start/end_pfn() in each archs
and defines a unified one in linux/mmzone.h. It's not under
CONFIG_NEED_MULTIPLE_NODES, now.

A result of macro expansion is here (mm/page_cgroup.c)

for !NUMA
 start_pfn = ((&contig_page_data)->node_start_pfn);
  end_pfn = ({ pg_data_t *__pgdat = (&contig_page_data); __pgdat->node_start_pfn + __pgdat->node_spanned_pages;});

for NUMA (x86-64)
  start_pfn = ((node_data[nid])->node_start_pfn);
  end_pfn = ({ pg_data_t *__pgdat = (node_data[nid]); __pgdat->node_start_pfn + __pgdat->node_spanned_pages;});

Changelog:
 - fixed to avoid using "nid" twice in node_end_pfn() macro.

Reported-and-acked-by: Randy Dunlap <randy.dunlap@oracle.com>
Reported-and-tested-by: Ingo Molnar <mingo@elte.hu>
Acked-by: Mel Gorman <mgorman@suse.de>
Signed-off-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
arch/alpha/include/asm/mmzone.h
arch/m32r/include/asm/mmzone.h
arch/parisc/include/asm/mmzone.h
arch/powerpc/include/asm/mmzone.h
arch/sh/include/asm/mmzone.h
arch/sparc/include/asm/mmzone.h
arch/tile/include/asm/mmzone.h
arch/x86/include/asm/mmzone_32.h
arch/x86/include/asm/mmzone_64.h
include/linux/mmzone.h