aboutsummaryrefslogtreecommitdiffstats
path: root/mm/bootmem.c
diff options
context:
space:
mode:
authorYasunori Goto <y-goto@jp.fujitsu.com>2008-04-28 05:13:32 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2008-04-28 11:58:25 -0400
commite70260aabea3af2a84b951e75166dcebe689b88e (patch)
tree196dc5f2804f9f5496f51954330a036e3a2762d8 /mm/bootmem.c
parent9d99217a02a06a7cc83f065b73e976970970c58c (diff)
memory hotplug: make alloc_bootmem_section()
alloc_bootmem_section() can allocate specified section's area. This is used for usemap to keep same section with pgdat by later patch. Signed-off-by: Yasunori Goto <y-goto@jp.fujitsu.com> Cc: Badari Pulavarty <pbadari@us.ibm.com> Cc: Yinghai Lu <yhlu.kernel@gmail.com> Cc: Yasunori Goto <y-goto@jp.fujitsu.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'mm/bootmem.c')
-rw-r--r--mm/bootmem.c31
1 files changed, 31 insertions, 0 deletions
diff --git a/mm/bootmem.c b/mm/bootmem.c
index 369624d2789c..e8fb927392b9 100644
--- a/mm/bootmem.c
+++ b/mm/bootmem.c
@@ -545,6 +545,37 @@ void * __init __alloc_bootmem_node(pg_data_t *pgdat, unsigned long size,
545 return __alloc_bootmem(size, align, goal); 545 return __alloc_bootmem(size, align, goal);
546} 546}
547 547
548#ifdef CONFIG_SPARSEMEM
549void * __init alloc_bootmem_section(unsigned long size,
550 unsigned long section_nr)
551{
552 void *ptr;
553 unsigned long limit, goal, start_nr, end_nr, pfn;
554 struct pglist_data *pgdat;
555
556 pfn = section_nr_to_pfn(section_nr);
557 goal = PFN_PHYS(pfn);
558 limit = PFN_PHYS(section_nr_to_pfn(section_nr + 1)) - 1;
559 pgdat = NODE_DATA(early_pfn_to_nid(pfn));
560 ptr = __alloc_bootmem_core(pgdat->bdata, size, SMP_CACHE_BYTES, goal,
561 limit);
562
563 if (!ptr)
564 return NULL;
565
566 start_nr = pfn_to_section_nr(PFN_DOWN(__pa(ptr)));
567 end_nr = pfn_to_section_nr(PFN_DOWN(__pa(ptr) + size));
568 if (start_nr != section_nr || end_nr != section_nr) {
569 printk(KERN_WARNING "alloc_bootmem failed on section %ld.\n",
570 section_nr);
571 free_bootmem_core(pgdat->bdata, __pa(ptr), size);
572 ptr = NULL;
573 }
574
575 return ptr;
576}
577#endif
578
548#ifndef ARCH_LOW_ADDRESS_LIMIT 579#ifndef ARCH_LOW_ADDRESS_LIMIT
549#define ARCH_LOW_ADDRESS_LIMIT 0xffffffffUL 580#define ARCH_LOW_ADDRESS_LIMIT 0xffffffffUL
550#endif 581#endif