diff options
author | Tejun Heo <tj@kernel.org> | 2011-07-12 03:44:22 -0400 |
---|---|---|
committer | H. Peter Anvin <hpa@linux.intel.com> | 2011-07-13 00:58:11 -0400 |
commit | d0ead157387f19801beb1b419568723b2e9b7c79 (patch) | |
tree | 0615789f48d6ccd91036ddb5cb8fcdb3048ebe8a /arch/x86/include/asm | |
parent | 620917de59eeb934b9f8cf35cc2d95c1ac8ed0fc (diff) |
x86, mm: s/PAGES_PER_ELEMENT/PAGES_PER_SECTION/
DISCONTIGMEM on x86-32 implements pfn -> nid mapping similarly to
SPARSEMEM; however, it calls each mapping unit ELEMENT instead of
SECTION. This patch renames it to SECTION so that PAGES_PER_SECTION
is valid for both DISCONTIGMEM and SPARSEMEM. This will be used by
the next patch to implement mapping granularity check.
This patch is trivial constant rename.
Signed-off-by: Tejun Heo <tj@kernel.org>
Link: http://lkml.kernel.org/r/20110712074422.GA2872@htj.dyndns.org
Cc: Hans Rosenfeld <hans.rosenfeld@amd.com>
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Diffstat (limited to 'arch/x86/include/asm')
-rw-r--r-- | arch/x86/include/asm/mmzone_32.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/x86/include/asm/mmzone_32.h b/arch/x86/include/asm/mmzone_32.h index ffa037f28d39..55728e121473 100644 --- a/arch/x86/include/asm/mmzone_32.h +++ b/arch/x86/include/asm/mmzone_32.h | |||
@@ -34,15 +34,15 @@ static inline void resume_map_numa_kva(pgd_t *pgd) {} | |||
34 | * 64Gb / 4096bytes/page = 16777216 pages | 34 | * 64Gb / 4096bytes/page = 16777216 pages |
35 | */ | 35 | */ |
36 | #define MAX_NR_PAGES 16777216 | 36 | #define MAX_NR_PAGES 16777216 |
37 | #define MAX_ELEMENTS 1024 | 37 | #define MAX_SECTIONS 1024 |
38 | #define PAGES_PER_ELEMENT (MAX_NR_PAGES/MAX_ELEMENTS) | 38 | #define PAGES_PER_SECTION (MAX_NR_PAGES/MAX_SECTIONS) |
39 | 39 | ||
40 | extern s8 physnode_map[]; | 40 | extern s8 physnode_map[]; |
41 | 41 | ||
42 | static inline int pfn_to_nid(unsigned long pfn) | 42 | static inline int pfn_to_nid(unsigned long pfn) |
43 | { | 43 | { |
44 | #ifdef CONFIG_NUMA | 44 | #ifdef CONFIG_NUMA |
45 | return((int) physnode_map[(pfn) / PAGES_PER_ELEMENT]); | 45 | return((int) physnode_map[(pfn) / PAGES_PER_SECTION]); |
46 | #else | 46 | #else |
47 | return 0; | 47 | return 0; |
48 | #endif | 48 | #endif |