From: Tang Chen <tangchen@cn.fujitsu.com>
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 [thread overview]
Message-ID: <1377596268-31552-2-git-send-email-tangchen@cn.fujitsu.com> (raw)
In-Reply-To: <1377596268-31552-1-git-send-email-tangchen@cn.fujitsu.com>
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 <tangchen@cn.fujitsu.com>
Reviewed-by: Zhang Yanfei <zhangyanfei@cn.fujitsu.com>
---
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
next prev parent reply other threads:[~2013-08-27 9:42 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-08-27 9:37 [PATCH 00/11] x86, memblock: Allocate memory near kernel image before SRAT parsed Tang Chen
2013-08-27 9:37 ` Tang Chen [this message]
2013-08-27 9:37 ` [PATCH 02/11] memblock: Rename memblock_set_current_limit() to memblock_set_current_limit_high() Tang Chen
2013-08-27 9:37 ` [PATCH 03/11] memblock: Introduce lowest limit in memblock Tang Chen
2013-08-27 9:37 ` [PATCH 04/11] memblock: Introduce memblock_set_current_limit_low() to set lower limit of memblock Tang Chen
2013-08-27 9:37 ` [PATCH 05/11] memblock: Introduce allocation order to memblock Tang Chen
[not found] ` <20130905091615.GB15294@hacker.(null)>
2013-09-05 9:21 ` Tang Chen
2013-08-27 9:37 ` [PATCH 06/11] memblock: Improve memblock to support allocation from lower address Tang Chen
2013-09-04 0:24 ` Toshi Kani
2013-09-04 1:00 ` Tang Chen
2013-08-27 9:37 ` [PATCH 07/11] x86, memblock: Set lowest limit for memblock_alloc_base_nid() Tang Chen
2013-09-04 0:37 ` Toshi Kani
2013-09-04 2:05 ` Tang Chen
2013-09-04 15:22 ` Toshi Kani
2013-08-27 9:37 ` [PATCH 08/11] x86, acpi, memblock: Use __memblock_alloc_base() in acpi_initrd_override() Tang Chen
2013-08-28 0:04 ` Rafael J. Wysocki
2013-08-27 9:37 ` [PATCH 09/11] mem-hotplug: Introduce movablenode boot option to {en|dis}able using SRAT Tang Chen
2013-08-27 9:37 ` [PATCH 10/11] x86, mem-hotplug: Support initialize page tables from low to high Tang Chen
[not found] ` <20130905133027.GA23038@hacker.(null)>
2013-09-06 1:34 ` Tang Chen
[not found] ` <20130906021653.GA1062@hacker.(null)>
2013-09-06 3:09 ` Tang Chen
2013-08-27 9:37 ` [PATCH 11/11] x86, mem_hotplug: Allocate memory near kernel image before SRAT is parsed Tang Chen
2013-09-04 19:40 ` Toshi Kani
[not found] ` <20130828080311.GA608@hacker.(null)>
2013-08-28 9:34 ` [PATCH 00/11] x86, memblock: Allocate memory near kernel image before SRAT parsed Tang Chen
2013-08-28 15:19 ` Tejun Heo
2013-08-29 1:30 ` Tang Chen
[not found] ` <20130829013657.GA22599@hacker.(null)>
2013-08-29 1:53 ` Tang Chen
2013-09-02 1:03 ` Tang Chen
2013-09-04 19:22 ` Tejun Heo
2013-09-05 9:01 ` Tang Chen
[not found] ` <52299935.0302450a.26c9.ffffb240SMTPIN_ADDED_BROKEN@mx.google.com>
2013-09-06 15:15 ` Tejun Heo
2013-09-06 15:47 ` H. Peter Anvin
[not found] ` <522db781.22ab440a.41b1.ffffd825SMTPIN_ADDED_BROKEN@mx.google.com>
2013-09-09 13:58 ` Tejun Heo
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1377596268-31552-2-git-send-email-tangchen@cn.fujitsu.com \
--to=tangchen@cn.fujitsu.com \
--cc=akpm@linux-foundation.org \
--cc=gong.chen@linux.intel.com \
--cc=hpa@zytor.com \
--cc=isimatu.yasuaki@jp.fujitsu.com \
--cc=izumi.taku@jp.fujitsu.com \
--cc=jiang.liu@huawei.com \
--cc=jweiner@redhat.com \
--cc=laijs@cn.fujitsu.com \
--cc=lenb@kernel.org \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-doc@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=lwoodman@redhat.com \
--cc=mgorman@suse.de \
--cc=mina86@mina86.com \
--cc=minchan@kernel.org \
--cc=mingo@elte.hu \
--cc=prarit@redhat.com \
--cc=riel@redhat.com \
--cc=rjw@sisk.pl \
--cc=tglx@linutronix.de \
--cc=tj@kernel.org \
--cc=trenn@suse.de \
--cc=vasilis.liaskovitis@profitbricks.com \
--cc=wency@cn.fujitsu.com \
--cc=x86@kernel.org \
--cc=yinghai@kernel.org \
--cc=zhangyanfei@cn.fujitsu.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).