Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753877Ab3H0JmJ (ORCPT ); Tue, 27 Aug 2013 05:42:09 -0400 Received: from cn.fujitsu.com ([222.73.24.84]:49294 "EHLO song.cn.fujitsu.com" rhost-flags-OK-FAIL-OK-OK) by vger.kernel.org with ESMTP id S1753055Ab3H0JjM (ORCPT ); Tue, 27 Aug 2013 05:39:12 -0400 X-IronPort-AV: E=Sophos;i="4.89,967,1367942400"; d="scan'208";a="8317101" From: Tang Chen To: rjw@sisk.pl, lenb@kernel.org, tglx@linutronix.de, mingo@elte.hu, hpa@zytor.com, akpm@linux-foundation.org, tj@kernel.org, trenn@suse.de, yinghai@kernel.org, jiang.liu@huawei.com, wency@cn.fujitsu.com, laijs@cn.fujitsu.com, isimatu.yasuaki@jp.fujitsu.com, izumi.taku@jp.fujitsu.com, mgorman@suse.de, minchan@kernel.org, mina86@mina86.com, gong.chen@linux.intel.com, vasilis.liaskovitis@profitbricks.com, lwoodman@redhat.com, riel@redhat.com, jweiner@redhat.com, prarit@redhat.com, zhangyanfei@cn.fujitsu.com Cc: x86@kernel.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org, linux-acpi@vger.kernel.org Subject: [PATCH 01/11] memblock: Rename current_limit to current_limit_high in memblock. Date: Tue, 27 Aug 2013 17:37:38 +0800 Message-Id: <1377596268-31552-2-git-send-email-tangchen@cn.fujitsu.com> X-Mailer: git-send-email 1.7.11.7 In-Reply-To: <1377596268-31552-1-git-send-email-tangchen@cn.fujitsu.com> References: <1377596268-31552-1-git-send-email-tangchen@cn.fujitsu.com> X-MIMETrack: Itemize by SMTP Server on mailserver/fnst(Release 8.5.3|September 15, 2011) at 2013/08/27 17:37:09, Serialize by Router on mailserver/fnst(Release 8.5.3|September 15, 2011) at 2013/08/27 17:37:13, Serialize complete at 2013/08/27 17:37:13 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3198 Lines: 93 memblock.current_limit specifies the highest address that memblock could allocate. The next coming patches will introduce a lowest limit to memblock, so rename it to current_limit_high. Signed-off-by: Tang Chen Reviewed-by: Zhang Yanfei --- include/linux/memblock.h | 2 +- mm/memblock.c | 10 +++++----- mm/nobootmem.c | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/include/linux/memblock.h b/include/linux/memblock.h index f388203..f0c0a91 100644 --- a/include/linux/memblock.h +++ b/include/linux/memblock.h @@ -35,7 +35,7 @@ struct memblock_type { }; struct memblock { - phys_addr_t current_limit; + phys_addr_t current_limit_high; /* upper boundary of accessable range */ struct memblock_type memory; struct memblock_type reserved; }; diff --git a/mm/memblock.c b/mm/memblock.c index a847bfe..ff2226f 100644 --- a/mm/memblock.c +++ b/mm/memblock.c @@ -32,7 +32,7 @@ struct memblock memblock __initdata_memblock = { .reserved.cnt = 1, /* empty dummy entry */ .reserved.max = INIT_MEMBLOCK_REGIONS, - .current_limit = MEMBLOCK_ALLOC_ANYWHERE, + .current_limit_high = MEMBLOCK_ALLOC_ANYWHERE, }; int memblock_debug __initdata_memblock; @@ -104,7 +104,7 @@ phys_addr_t __init_memblock memblock_find_in_range_node(phys_addr_t start, /* pump up @end */ if (end == MEMBLOCK_ALLOC_ACCESSIBLE) - end = memblock.current_limit; + end = memblock.current_limit_high; /* avoid allocating the first page */ start = max_t(phys_addr_t, start, PAGE_SIZE); @@ -240,11 +240,11 @@ static int __init_memblock memblock_double_array(struct memblock_type *type, new_area_start = new_area_size = 0; addr = memblock_find_in_range(new_area_start + new_area_size, - memblock.current_limit, + memblock.current_limit_high, new_alloc_size, PAGE_SIZE); if (!addr && new_area_size) addr = memblock_find_in_range(0, - min(new_area_start, memblock.current_limit), + min(new_area_start, memblock.current_limit_high), new_alloc_size, PAGE_SIZE); new_array = addr ? __va(addr) : NULL; @@ -979,7 +979,7 @@ void __init_memblock memblock_trim_memory(phys_addr_t align) void __init_memblock memblock_set_current_limit(phys_addr_t limit) { - memblock.current_limit = limit; + memblock.current_limit_high = limit; } static void __init_memblock memblock_dump(struct memblock_type *type, char *name) diff --git a/mm/nobootmem.c b/mm/nobootmem.c index 61107cf..8cc163c 100644 --- a/mm/nobootmem.c +++ b/mm/nobootmem.c @@ -38,8 +38,8 @@ static void * __init __alloc_memory_core_early(int nid, u64 size, u64 align, void *ptr; u64 addr; - if (limit > memblock.current_limit) - limit = memblock.current_limit; + if (limit > memblock.current_limit_high) + limit = memblock.current_limit_high; addr = memblock_find_in_range_node(goal, limit, size, align, nid); if (!addr) -- 1.7.1 -- 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/