SECTION_TO_ROOT() doesn't actually take a section, it takes a section number. Make its name reflect that. Signed-off-by: Dave Hansen --- memhotplug-dave/include/linux/mmzone.h | 6 +++--- memhotplug-dave/mm/sparse.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff -puN include/linux/mmzone.h~A5-extreme-SEC_TO_ROOT include/linux/mmzone.h --- memhotplug/include/linux/mmzone.h~A5-extreme-SEC_TO_ROOT 2005-07-28 13:50:15.000000000 -0700 +++ memhotplug-dave/include/linux/mmzone.h 2005-07-28 13:50:15.000000000 -0700 @@ -493,7 +493,7 @@ struct mem_section { #define SECTIONS_PER_ROOT 1 #endif -#define SECTION_TO_ROOT(_sec) ((_sec) / SECTIONS_PER_ROOT) +#define SECTION_NR_TO_ROOT(sec) ((sec) / SECTIONS_PER_ROOT) #define NR_SECTION_ROOTS (NR_MEM_SECTIONS / SECTIONS_PER_ROOT) #define SECTION_ROOT_MASK (SECTIONS_PER_ROOT - 1) @@ -505,9 +505,9 @@ extern struct mem_section mem_section[NR static inline struct mem_section *__nr_to_section(unsigned long nr) { - if (!mem_section[SECTION_TO_ROOT(nr)]) + if (!mem_section[SECTION_NR_TO_ROOT(nr)]) return NULL; - return &mem_section[SECTION_TO_ROOT(nr)][nr & SECTION_ROOT_MASK]; + return &mem_section[SECTION_NR_TO_ROOT(nr)][nr & SECTION_ROOT_MASK]; } /* diff -puN mm/sparse.c~A5-extreme-SEC_TO_ROOT mm/sparse.c --- memhotplug/mm/sparse.c~A5-extreme-SEC_TO_ROOT 2005-07-28 13:50:15.000000000 -0700 +++ memhotplug-dave/mm/sparse.c 2005-07-28 13:50:15.000000000 -0700 @@ -31,7 +31,7 @@ static void sparse_alloc_root(unsigned l static void sparse_index_init(unsigned long section, int nid) { - unsigned long root = SECTION_TO_ROOT(section); + unsigned long root = SECTION_NR_TO_ROOT(section); if (mem_section[root]) return; _