aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/linux/mmzone.h40
1 files changed, 15 insertions, 25 deletions
diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h
index b97054bbc394..79cf578e21b9 100644
--- a/include/linux/mmzone.h
+++ b/include/linux/mmzone.h
@@ -487,39 +487,29 @@ struct mem_section {
487 unsigned long section_mem_map; 487 unsigned long section_mem_map;
488}; 488};
489 489
490#ifdef CONFIG_ARCH_SPARSEMEM_EXTREME 490#ifdef CONFIG_SPARSEMEM_EXTREME
491/* 491#define SECTIONS_PER_ROOT (PAGE_SIZE / sizeof (struct mem_section))
492 * Should we ever require GCC 4 or later then the flat array scheme 492#else
493 * can be eliminated and a uniform solution for EXTREME and !EXTREME can 493#define SECTIONS_PER_ROOT 1
494 * be arrived at. 494#endif
495 */
496#define SECTION_ROOT_SHIFT (PAGE_SHIFT-3)
497#define SECTION_ROOT_MASK ((1UL<<SECTION_ROOT_SHIFT) - 1)
498#define SECTION_TO_ROOT(_sec) ((_sec) >> SECTION_ROOT_SHIFT)
499#define NR_SECTION_ROOTS (NR_MEM_SECTIONS >> SECTION_ROOT_SHIFT)
500 495
501extern struct mem_section *mem_section[NR_SECTION_ROOTS]; 496#define SECTION_NR_TO_ROOT(sec) ((sec) / SECTIONS_PER_ROOT)
502 497#define NR_SECTION_ROOTS (NR_MEM_SECTIONS / SECTIONS_PER_ROOT)
503static inline struct mem_section *__nr_to_section(unsigned long nr) 498#define SECTION_ROOT_MASK (SECTIONS_PER_ROOT - 1)
504{
505 if (!mem_section[SECTION_TO_ROOT(nr)])
506 return NULL;
507 return &mem_section[SECTION_TO_ROOT(nr)][nr & SECTION_ROOT_MASK];
508}
509 499
500#ifdef CONFIG_SPARSEMEM_EXTREME
501extern struct mem_section *mem_section[NR_SECTION_ROOTS];
510#else 502#else
511 503extern struct mem_section mem_section[NR_SECTION_ROOTS][SECTIONS_PER_ROOT];
512extern struct mem_section mem_section[NR_MEM_SECTIONS]; 504#endif
513 505
514static inline struct mem_section *__nr_to_section(unsigned long nr) 506static inline struct mem_section *__nr_to_section(unsigned long nr)
515{ 507{
516 return &mem_section[nr]; 508 if (!mem_section[SECTION_NR_TO_ROOT(nr)])
509 return NULL;
510 return &mem_section[SECTION_NR_TO_ROOT(nr)][nr & SECTION_ROOT_MASK];
517} 511}
518 512
519#define sparse_index_init(_sec, _nid) do {} while (0)
520
521#endif
522
523/* 513/*
524 * We use the lower bits of the mem_map pointer to store 514 * We use the lower bits of the mem_map pointer to store
525 * a little bit of information. There should be at least 515 * a little bit of information. There should be at least