From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756588AbYDCFmr (ORCPT ); Thu, 3 Apr 2008 01:42:47 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754865AbYDCFmh (ORCPT ); Thu, 3 Apr 2008 01:42:37 -0400 Received: from fgwmail5.fujitsu.co.jp ([192.51.44.35]:40202 "EHLO fgwmail5.fujitsu.co.jp" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754709AbYDCFmg (ORCPT ); Thu, 3 Apr 2008 01:42:36 -0400 Date: Thu, 03 Apr 2008 14:41:54 +0900 From: Yasunori Goto To: Badari Pulavarty Subject: [Patch 003/005](memory hotplug) make alloc_bootmem_section() Cc: Andrew Morton , Linux Kernel ML , Yinghai Lu , linux-mm In-Reply-To: <20080403140221.D1F2.E1E9C6FF@jp.fujitsu.com> References: <20080403140221.D1F2.E1E9C6FF@jp.fujitsu.com> X-Mailer-Plugin: BkASPil for Becky!2 Ver.2.068 Message-Id: <20080403144027.D1FC.E1E9C6FF@jp.fujitsu.com> MIME-Version: 1.0 Content-Type: text/plain; charset="US-ASCII" Content-Transfer-Encoding: 7bit X-Mailer: Becky! ver. 2.45 [ja] Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 include/linux/bootmem.h | 2 ++ mm/bootmem.c | 25 +++++++++++++++++++++++++ 2 files changed, 27 insertions(+) Index: current/include/linux/bootmem.h =================================================================== --- current.orig/include/linux/bootmem.h 2008-04-01 20:56:39.000000000 +0900 +++ current/include/linux/bootmem.h 2008-04-01 20:59:02.000000000 +0900 @@ -101,6 +101,8 @@ extern void free_bootmem_node(pg_data_t *pgdat, unsigned long addr, unsigned long size); +extern void *alloc_bootmem_section(unsigned long size, + unsigned long section_nr); #ifndef CONFIG_HAVE_ARCH_BOOTMEM_NODE #define alloc_bootmem_node(pgdat, x) \ Index: current/mm/bootmem.c =================================================================== --- current.orig/mm/bootmem.c 2008-04-01 20:56:39.000000000 +0900 +++ current/mm/bootmem.c 2008-04-01 20:59:02.000000000 +0900 @@ -540,6 +540,31 @@ return __alloc_bootmem(size, align, goal); } +void * __init alloc_bootmem_section(unsigned long size, + unsigned long section_nr) +{ + void *ptr; + unsigned long limit, goal, start_nr, end_nr, pfn; + struct pglist_data *pgdat; + + pfn = section_nr_to_pfn(section_nr); + goal = PFN_PHYS(pfn); + limit = PFN_PHYS(section_nr_to_pfn(section_nr + 1)) - 1; + pgdat = NODE_DATA(early_pfn_to_nid(pfn)); + ptr = __alloc_bootmem_core(pgdat->bdata, size, SMP_CACHE_BYTES, goal, + limit); + + start_nr = pfn_to_section_nr(PFN_DOWN(__pa(ptr))); + end_nr = pfn_to_section_nr(PFN_DOWN(__pa(ptr) + size)); + if (start_nr != section_nr || end_nr != section_nr) { + printk(KERN_WARNING "alloc_bootmem failed on section %ld.\n", + section_nr); + free_bootmem_core(pgdat->bdata, __pa(ptr), size); + ptr = NULL; + } + + return ptr; +} #ifndef ARCH_LOW_ADDRESS_LIMIT #define ARCH_LOW_ADDRESS_LIMIT 0xffffffffUL #endif -- Yasunori Goto