Commit c6830c22 authored by KAMEZAWA Hiroyuki's avatar KAMEZAWA Hiroyuki Committed by Linus Torvalds
Browse files

Fix node_start/end_pfn() definition for mm/page_cgroup.c 



commit 21a3c964 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: default avatarRandy Dunlap <randy.dunlap@oracle.com>
Reported-and-tested-by: default avatarIngo Molnar <mingo@elte.hu>
Acked-by: default avatarMel Gorman <mgorman@suse.de>
Signed-off-by: default avatarKAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent af4087e0

arch/alpha/include/asm/mmzone.h

+0 −1
Original line number Diff line number Diff line
@@ -56,7 +56,6 @@ PLAT_NODE_DATA_LOCALNR(unsigned long p, int n) 
 * Given a kernel address, find the home node of the underlying memory.

 */

#define kvaddr_to_nid(kaddr)	pa_to_nid(__pa(kaddr))

#define node_start_pfn(nid)	(NODE_DATA(nid)->node_start_pfn)



/*

 * Given a kaddr, LOCAL_BASE_ADDR finds the owning node of the memory

arch/m32r/include/asm/mmzone.h

+1 −7
Original line number Diff line number Diff line
@@ -14,12 +14,6 @@ extern struct pglist_data *node_data[]; 
#define NODE_DATA(nid)		(node_data[nid])



#define node_localnr(pfn, nid)	((pfn) - NODE_DATA(nid)->node_start_pfn)

#define node_start_pfn(nid)	(NODE_DATA(nid)->node_start_pfn)

#define node_end_pfn(nid)						\

({									\

	pg_data_t *__pgdat = NODE_DATA(nid);				\

	__pgdat->node_start_pfn + __pgdat->node_spanned_pages - 1;	\

})



#define pmd_page(pmd)		(pfn_to_page(pmd_val(pmd) >> PAGE_SHIFT))

/*
@@ -44,7 +38,7 @@ static __inline__ int pfn_to_nid(unsigned long pfn) 
	int node;



	for (node = 0 ; node < MAX_NUMNODES ; node++)

		if (pfn >= node_start_pfn(node) && pfn <= node_end_pfn(node))

		if (pfn >= node_start_pfn(node) && pfn < node_end_pfn(node))

			break;



	return node;

arch/parisc/include/asm/mmzone.h

+0 −7
Original line number Diff line number Diff line
@@ -14,13 +14,6 @@ extern struct node_map_data node_data[]; 


#define NODE_DATA(nid)          (&node_data[nid].pg_data)



#define node_start_pfn(nid)	(NODE_DATA(nid)->node_start_pfn)

#define node_end_pfn(nid)						\

({									\

	pg_data_t *__pgdat = NODE_DATA(nid);				\

	__pgdat->node_start_pfn + __pgdat->node_spanned_pages;		\

})



/* We have these possible memory map layouts:

 * Astro: 0-3.75, 67.75-68, 4-64

 * zx1: 0-1, 257-260, 4-256

arch/powerpc/include/asm/mmzone.h

+0 −7
Original line number Diff line number Diff line
@@ -38,13 +38,6 @@ u64 memory_hotplug_max(void); 
#define memory_hotplug_max() memblock_end_of_DRAM()

#endif



/*

 * Following are macros that each numa implmentation must define.

 */



#define node_start_pfn(nid)	(NODE_DATA(nid)->node_start_pfn)

#define node_end_pfn(nid)	(NODE_DATA(nid)->node_end_pfn)



#else

#define memory_hotplug_max() memblock_end_of_DRAM()

#endif /* CONFIG_NEED_MULTIPLE_NODES */

arch/sh/include/asm/mmzone.h

+0 −4
Original line number Diff line number Diff line
@@ -9,10 +9,6 @@ 
extern struct pglist_data *node_data[];

#define NODE_DATA(nid)		(node_data[nid])



#define node_start_pfn(nid)	(NODE_DATA(nid)->node_start_pfn)

#define node_end_pfn(nid)	(NODE_DATA(nid)->node_start_pfn + \

				 NODE_DATA(nid)->node_spanned_pages)



static inline int pfn_to_nid(unsigned long pfn)

{

	int nid;