forked from Minki/linux
c6830c2260
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>
48 lines
1.1 KiB
C
48 lines
1.1 KiB
C
#ifndef __ASM_SH_MMZONE_H
|
|
#define __ASM_SH_MMZONE_H
|
|
|
|
#ifdef __KERNEL__
|
|
|
|
#ifdef CONFIG_NEED_MULTIPLE_NODES
|
|
#include <linux/numa.h>
|
|
|
|
extern struct pglist_data *node_data[];
|
|
#define NODE_DATA(nid) (node_data[nid])
|
|
|
|
static inline int pfn_to_nid(unsigned long pfn)
|
|
{
|
|
int nid;
|
|
|
|
for (nid = 0; nid < MAX_NUMNODES; nid++)
|
|
if (pfn >= node_start_pfn(nid) && pfn <= node_end_pfn(nid))
|
|
break;
|
|
|
|
return nid;
|
|
}
|
|
|
|
static inline struct pglist_data *pfn_to_pgdat(unsigned long pfn)
|
|
{
|
|
return NODE_DATA(pfn_to_nid(pfn));
|
|
}
|
|
|
|
/* arch/sh/mm/numa.c */
|
|
void __init setup_bootmem_node(int nid, unsigned long start, unsigned long end);
|
|
#else
|
|
static inline void
|
|
setup_bootmem_node(int nid, unsigned long start, unsigned long end)
|
|
{
|
|
}
|
|
#endif /* CONFIG_NEED_MULTIPLE_NODES */
|
|
|
|
/* Platform specific mem init */
|
|
void __init plat_mem_setup(void);
|
|
|
|
/* arch/sh/kernel/setup.c */
|
|
void __init __add_active_range(unsigned int nid, unsigned long start_pfn,
|
|
unsigned long end_pfn);
|
|
/* arch/sh/mm/init.c */
|
|
void __init allocate_pgdat(unsigned int nid);
|
|
|
|
#endif /* __KERNEL__ */
|
|
#endif /* __ASM_SH_MMZONE_H */
|