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>
71 lines
2.1 KiB
C
71 lines
2.1 KiB
C
/*
|
|
* Copyright 2010 Tilera Corporation. All Rights Reserved.
|
|
*
|
|
* This program is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU General Public License
|
|
* as published by the Free Software Foundation, version 2.
|
|
*
|
|
* This program is distributed in the hope that it will be useful, but
|
|
* WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE, GOOD TITLE or
|
|
* NON INFRINGEMENT. See the GNU General Public License for
|
|
* more details.
|
|
*/
|
|
|
|
#ifndef _ASM_TILE_MMZONE_H
|
|
#define _ASM_TILE_MMZONE_H
|
|
|
|
extern struct pglist_data node_data[];
|
|
#define NODE_DATA(nid) (&node_data[nid])
|
|
|
|
extern void get_memcfg_numa(void);
|
|
|
|
#ifdef CONFIG_DISCONTIGMEM
|
|
|
|
#include <asm/page.h>
|
|
|
|
/*
|
|
* Generally, memory ranges are always doled out by the hypervisor in
|
|
* fixed-size, power-of-two increments. That would make computing the node
|
|
* very easy. We could just take a couple high bits of the PA, which
|
|
* denote the memory shim, and we'd be done. However, when we're doing
|
|
* memory striping, this may not be true; PAs with different high bit
|
|
* values might be in the same node. Thus, we keep a lookup table to
|
|
* translate the high bits of the PFN to the node number.
|
|
*/
|
|
extern int highbits_to_node[];
|
|
|
|
static inline int pfn_to_nid(unsigned long pfn)
|
|
{
|
|
return highbits_to_node[__pfn_to_highbits(pfn)];
|
|
}
|
|
|
|
#define kern_addr_valid(kaddr) virt_addr_valid((void *)kaddr)
|
|
|
|
static inline int pfn_valid(int pfn)
|
|
{
|
|
int nid = pfn_to_nid(pfn);
|
|
|
|
if (nid >= 0)
|
|
return (pfn < node_end_pfn(nid));
|
|
return 0;
|
|
}
|
|
|
|
/* Information on the NUMA nodes that we compute early */
|
|
extern unsigned long node_start_pfn[];
|
|
extern unsigned long node_end_pfn[];
|
|
extern unsigned long node_memmap_pfn[];
|
|
extern unsigned long node_percpu_pfn[];
|
|
extern unsigned long node_free_pfn[];
|
|
#ifdef CONFIG_HIGHMEM
|
|
extern unsigned long node_lowmem_end_pfn[];
|
|
#endif
|
|
#ifdef CONFIG_PCI
|
|
extern unsigned long pci_reserve_start_pfn;
|
|
extern unsigned long pci_reserve_end_pfn;
|
|
#endif
|
|
|
|
#endif /* CONFIG_DISCONTIGMEM */
|
|
|
|
#endif /* _ASM_TILE_MMZONE_H */
|