Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753861Ab2KMFv7 (ORCPT ); Tue, 13 Nov 2012 00:51:59 -0500 Received: from fgwmail6.fujitsu.co.jp ([192.51.44.36]:58201 "EHLO fgwmail6.fujitsu.co.jp" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751537Ab2KMFv6 (ORCPT ); Tue, 13 Nov 2012 00:51:58 -0500 X-SecurityPolicyCheck: OK by SHieldMailChecker v1.7.4 Message-ID: <50A1DFE1.3070809@jp.fujitsu.com> Date: Tue, 13 Nov 2012 14:51:29 +0900 From: Yasuaki Ishimatsu User-Agent: Mozilla/5.0 (Windows NT 5.1; rv:16.0) Gecko/20121026 Thunderbird/16.0.2 MIME-Version: 1.0 To: Yinghai Lu CC: Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , Jacob Shin , Andrew Morton , Stefano Stabellini , Konrad Rzeszutek Wilk , Subject: Re: [PATCH 02/46] x86, mm: Split out split_mem_range from init_memory_mapping References: <20121112193044.GA11615@phenom.dumpdata.com> <1352755122-25660-1-git-send-email-yinghai@kernel.org> <1352755122-25660-3-git-send-email-yinghai@kernel.org> In-Reply-To: <1352755122-25660-3-git-send-email-yinghai@kernel.org> Content-Type: text/plain; charset="ISO-2022-JP" Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2794 Lines: 89 2012/11/13 6:17, Yinghai Lu wrote: > So make init_memory_mapping smaller and readable. > > Suggested-by: Ingo Molnar > Signed-off-by: Yinghai Lu > Reviewed-by: Pekka Enberg > --- > arch/x86/mm/init.c | 42 ++++++++++++++++++++++++++---------------- > 1 files changed, 26 insertions(+), 16 deletions(-) > > diff --git a/arch/x86/mm/init.c b/arch/x86/mm/init.c > index aa5b0da..6d8e102 100644 > --- a/arch/x86/mm/init.c > +++ b/arch/x86/mm/init.c > @@ -146,25 +146,13 @@ static int __meminit save_mr(struct map_range *mr, int nr_range, > return nr_range; > } > > -/* > - * Setup the direct mapping of the physical memory at PAGE_OFFSET. > - * This runs before bootmem is initialized and gets pages directly from > - * the physical memory. To access them they are temporarily mapped. > - */ > -unsigned long __init_refok init_memory_mapping(unsigned long start, > - unsigned long end) > +static int __meminit split_mem_range(struct map_range *mr, int nr_range, > + unsigned long start, > + unsigned long end) > { > unsigned long start_pfn, end_pfn; > - unsigned long ret = 0; > unsigned long pos; > - struct map_range mr[NR_RANGE_MR]; > - int nr_range, i; > - > - printk(KERN_INFO "init_memory_mapping: [mem %#010lx-%#010lx]\n", > - start, end - 1); > - > - memset(mr, 0, sizeof(mr)); > - nr_range = 0; > + int i; > > /* head if not big page alignment ? */ > start_pfn = start >> PAGE_SHIFT; > @@ -258,6 +246,28 @@ unsigned long __init_refok init_memory_mapping(unsigned long start, > (mr[i].page_size_mask & (1< (mr[i].page_size_mask & (1< > + return nr_range; > +} > + > +/* > + * Setup the direct mapping of the physical memory at PAGE_OFFSET. > + * This runs before bootmem is initialized and gets pages directly from > + * the physical memory. To access them they are temporarily mapped. > + */ > +unsigned long __init_refok init_memory_mapping(unsigned long start, > + unsigned long end) > +{ > + struct map_range mr[NR_RANGE_MR]; > + unsigned long ret = 0; > + int nr_range, i; > + > + pr_info("init_memory_mapping: [mem %#010lx-%#010lx]\n", > + start, end - 1); > + > + memset(mr, 0, sizeof(mr)); > + nr_range = 0; This is unnecessary since it is set in the below. > + nr_range = split_mem_range(mr, nr_range, start, end); Thanks, Yasuaki Ishimatsu > + > /* > * Find space for the kernel direct mapping tables. > * > -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/