[PATCH] remove non-DISCONTIG use of pgdat->node_mem_map
This patch effectively eliminates direct use of pgdat->node_mem_map outside of the DISCONTIG code. On a flat memory system, these fields aren't currently used, neither are they on a sparsemem system. There was also a node_mem_map(nid) macro on many architectures. Its use along with the use of ->node_mem_map itself was not consistent. It has been removed in favor of two new, more explicit, arch-independent macros: pgdat_page_nr(pgdat, pagenr) nid_page_nr(nid, pagenr) I called them "pgdat" and "nid" because we overload the term "node" to mean "NUMA node", "DISCONTIG node" or "pg_data_t" in very confusing ways. I believe the newer names are much clearer. These macros can be overridden in the sparsemem case with a theoretically slower operation using node_start_pfn and pfn_to_page(), instead. We could make this the only behavior if people want, but I don't want to change too much at once. One thing at a time. This patch removes more code than it adds. Compile tested on alpha, alpha discontig, arm, arm-discontig, i386, i386 generic, NUMAQ, Summit, ppc64, ppc64 discontig, and x86_64. Full list here: http://sr71.net/patches/2.6.12/2.6.12-rc1-mhp2/configs/ Boot tested on NUMAQ, x86 SMP and ppc64 power4/5 LPARs. Signed-off-by:Dave Hansen <haveblue@us.ibm.com> Signed-off-by:
Martin J. Bligh <mbligh@aracnet.com> Signed-off-by:
Andrew Morton <akpm@osdl.org> Signed-off-by:
Linus Torvalds <torvalds@osdl.org>
Showing
- arch/alpha/mm/numa.c 7 additions, 9 deletionsarch/alpha/mm/numa.c
- arch/i386/mm/pgtable.c 1 addition, 1 deletionarch/i386/mm/pgtable.c
- arch/ia64/mm/discontig.c 5 additions, 4 deletionsarch/ia64/mm/discontig.c
- arch/m32r/mm/init.c 2 additions, 2 deletionsarch/m32r/mm/init.c
- arch/mips/sgi-ip27/ip27-memory.c 2 additions, 3 deletionsarch/mips/sgi-ip27/ip27-memory.c
- arch/parisc/mm/init.c 1 addition, 1 deletionarch/parisc/mm/init.c
- arch/ppc64/mm/init.c 2 additions, 2 deletionsarch/ppc64/mm/init.c
- include/asm-alpha/mmzone.h 1 addition, 2 deletionsinclude/asm-alpha/mmzone.h
- include/asm-i386/mmzone.h 1 addition, 2 deletionsinclude/asm-i386/mmzone.h
- include/asm-m32r/mmzone.h 1 addition, 2 deletionsinclude/asm-m32r/mmzone.h
- include/asm-parisc/mmzone.h 1 addition, 2 deletionsinclude/asm-parisc/mmzone.h
- include/asm-ppc64/mmzone.h 1 addition, 2 deletionsinclude/asm-ppc64/mmzone.h
- include/asm-x86_64/mmzone.h 1 addition, 4 deletionsinclude/asm-x86_64/mmzone.h
- include/linux/mmzone.h 2 additions, 0 deletionsinclude/linux/mmzone.h
Loading
Please register or sign in to comment