mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-21 08:19:28 +00:00
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>
46 lines
994 B
C
46 lines
994 B
C
/*
|
|
* Written by Kanoj Sarcar (kanoj@sgi.com) Aug 99
|
|
*
|
|
* PowerPC64 port:
|
|
* Copyright (C) 2002 Anton Blanchard, IBM Corp.
|
|
*/
|
|
#ifndef _ASM_MMZONE_H_
|
|
#define _ASM_MMZONE_H_
|
|
#ifdef __KERNEL__
|
|
|
|
#include <linux/cpumask.h>
|
|
|
|
/*
|
|
* generic non-linear memory support:
|
|
*
|
|
* 1) we will not split memory into more chunks than will fit into the
|
|
* flags field of the struct page
|
|
*/
|
|
|
|
#ifdef CONFIG_NEED_MULTIPLE_NODES
|
|
|
|
extern struct pglist_data *node_data[];
|
|
/*
|
|
* Return a pointer to the node data for node n.
|
|
*/
|
|
#define NODE_DATA(nid) (node_data[nid])
|
|
|
|
/*
|
|
* Following are specific to this numa platform.
|
|
*/
|
|
|
|
extern int numa_cpu_lookup_table[];
|
|
extern cpumask_var_t node_to_cpumask_map[];
|
|
#ifdef CONFIG_MEMORY_HOTPLUG
|
|
extern unsigned long max_pfn;
|
|
u64 memory_hotplug_max(void);
|
|
#else
|
|
#define memory_hotplug_max() memblock_end_of_DRAM()
|
|
#endif
|
|
|
|
#else
|
|
#define memory_hotplug_max() memblock_end_of_DRAM()
|
|
#endif /* CONFIG_NEED_MULTIPLE_NODES */
|
|
|
|
#endif /* __KERNEL__ */
|
|
#endif /* _ASM_MMZONE_H_ */
|