From: Yinghai Lu <yinghai@kernel.org>
To: Ingo Molnar <mingo@elte.hu>, Thomas Gleixner <tglx@linutronix.de>,
"H. Peter Anvin" <hpa@zytor.com>,
Andrew Morton <akpm@linux-foundation.org>,
David Miller <davem@davemloft.net>,
Be
Cc: Johannes Weiner <hannes@cmpxchg.org>,
linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org,
Yinghai Lu <yinghai@kernel.org>
Subject: [PATCH 01/17] memblock: Add memblock_free/reserve_reserved_regions()
Date: Thu, 29 Jul 2010 12:45:21 -0700 [thread overview]
Message-ID: <1280432737-1808-2-git-send-email-yinghai@kernel.org> (raw)
In-Reply-To: <1280432737-1808-1-git-send-email-yinghai@kernel.org>
So we can avoid export memblock_reserved_init_regions()
Suggested by Ben.
Signed-off-by: Yinghai Lu <yinghai@kernel.org>
---
include/linux/memblock.h | 2 ++
mm/memblock.c | 24 ++++++++++++++++++++++++
2 files changed, 26 insertions(+), 0 deletions(-)
diff --git a/include/linux/memblock.h b/include/linux/memblock.h
index 5334b22..a05eabc 100644
--- a/include/linux/memblock.h
+++ b/include/linux/memblock.h
@@ -48,6 +48,8 @@ extern int memblock_can_resize;
if (memblock_debug) printk(KERN_INFO pr_fmt(fmt), ##__VA_ARGS__)
u64 memblock_find_in_range(u64 start, u64 end, u64 size, u64 align);
+int memblock_free_reserved_regions(void);
+int memblock_reserve_reserved_regions(void);
extern void __init memblock_init(void);
extern void __init memblock_analyze(void);
diff --git a/mm/memblock.c b/mm/memblock.c
index e7029c8..4db9e25 100644
--- a/mm/memblock.c
+++ b/mm/memblock.c
@@ -170,6 +170,30 @@ u64 __init_memblock memblock_find_in_range(u64 start, u64 end, u64 size, u64 ali
return memblock_find_base(size, align, start, end);
}
+/*
+ * Free memblock.reserved.regions
+ */
+int memblock_free_reserved_regions(void)
+{
+ if (memblock.reserved.regions == memblock_reserved_init_regions)
+ return 0;
+
+ return memblock_free(__pa(memblock.reserved.regions),
+ sizeof(struct memblock_region) * memblock.reserved.max);
+}
+
+/*
+ * Reserve memblock.reserved.regions
+ */
+int memblock_reserve_reserved_regions(void)
+{
+ if (memblock.reserved.regions == memblock_reserved_init_regions)
+ return 0;
+
+ return memblock_reserve(__pa(memblock.reserved.regions),
+ sizeof(struct memblock_region) * memblock.reserved.max);
+}
+
static void __init_memblock memblock_remove_region(struct memblock_type *type, unsigned long r)
{
unsigned long i;
--
1.6.4.2
WARNING: multiple messages have this Message-ID (diff)
From: Yinghai Lu <yinghai@kernel.org>
To: Ingo Molnar <mingo@elte.hu>, Thomas Gleixner <tglx@linutronix.de>,
"H. Peter Anvin" <hpa@zytor.com>,
Andrew Morton <akpm@linux-foundation.org>,
David Miller <davem@davemloft.net>,
Benjamin Herrenschmidt <benh@kernel.crashing.org>,
Linus Torvalds <torvalds@linux-foundation.org>
Cc: Johannes Weiner <hannes@cmpxchg.org>,
linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org,
Yinghai Lu <yinghai@kernel.org>
Subject: [PATCH 01/17] memblock: Add memblock_free/reserve_reserved_regions()
Date: Thu, 29 Jul 2010 12:45:21 -0700 [thread overview]
Message-ID: <1280432737-1808-2-git-send-email-yinghai@kernel.org> (raw)
Message-ID: <20100729194521.8Wwdi1HbOhSw11VKr0M73o60maMN0XdyGC0xyZ5R2CI@z> (raw)
In-Reply-To: <1280432737-1808-1-git-send-email-yinghai@kernel.org>
So we can avoid export memblock_reserved_init_regions()
Suggested by Ben.
Signed-off-by: Yinghai Lu <yinghai@kernel.org>
---
include/linux/memblock.h | 2 ++
mm/memblock.c | 24 ++++++++++++++++++++++++
2 files changed, 26 insertions(+), 0 deletions(-)
diff --git a/include/linux/memblock.h b/include/linux/memblock.h
index 5334b22..a05eabc 100644
--- a/include/linux/memblock.h
+++ b/include/linux/memblock.h
@@ -48,6 +48,8 @@ extern int memblock_can_resize;
if (memblock_debug) printk(KERN_INFO pr_fmt(fmt), ##__VA_ARGS__)
u64 memblock_find_in_range(u64 start, u64 end, u64 size, u64 align);
+int memblock_free_reserved_regions(void);
+int memblock_reserve_reserved_regions(void);
extern void __init memblock_init(void);
extern void __init memblock_analyze(void);
diff --git a/mm/memblock.c b/mm/memblock.c
index e7029c8..4db9e25 100644
--- a/mm/memblock.c
+++ b/mm/memblock.c
@@ -170,6 +170,30 @@ u64 __init_memblock memblock_find_in_range(u64 start, u64 end, u64 size, u64 ali
return memblock_find_base(size, align, start, end);
}
+/*
+ * Free memblock.reserved.regions
+ */
+int memblock_free_reserved_regions(void)
+{
+ if (memblock.reserved.regions == memblock_reserved_init_regions)
+ return 0;
+
+ return memblock_free(__pa(memblock.reserved.regions),
+ sizeof(struct memblock_region) * memblock.reserved.max);
+}
+
+/*
+ * Reserve memblock.reserved.regions
+ */
+int memblock_reserve_reserved_regions(void)
+{
+ if (memblock.reserved.regions == memblock_reserved_init_regions)
+ return 0;
+
+ return memblock_reserve(__pa(memblock.reserved.regions),
+ sizeof(struct memblock_region) * memblock.reserved.max);
+}
+
static void __init_memblock memblock_remove_region(struct memblock_type *type, unsigned long r)
{
unsigned long i;
--
1.6.4.2
next prev parent reply other threads:[~2010-07-29 19:47 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-07-29 19:45 [PATCH -v27 00/17] Use memblock with x86 Yinghai Lu
2010-07-29 19:45 ` Yinghai Lu
2010-07-29 19:45 ` Yinghai Lu [this message]
2010-07-29 19:45 ` [PATCH 01/17] memblock: Add memblock_free/reserve_reserved_regions() Yinghai Lu
2010-07-29 19:45 ` [PATCH 02/17] x86, memblock: Add memblock_x86_find_in_range_size() Yinghai Lu
2010-07-29 19:45 ` Yinghai Lu
2010-07-29 19:45 ` [PATCH 03/17] bootmem, x86: Add weak version of reserve_bootmem_generic Yinghai Lu
2010-07-29 19:45 ` Yinghai Lu
2010-07-29 19:45 ` [PATCH 04/17] x86, memblock: Add memblock_x86_to_bootmem() Yinghai Lu
2010-07-29 19:45 ` Yinghai Lu
2010-07-29 19:45 ` [PATCH 05/17] x86,memblock: Add memblock_x86_reserve_range/memblock_x86_free_range Yinghai Lu
2010-07-29 19:45 ` Yinghai Lu
2010-07-29 19:45 ` [PATCH 06/17] x86, memblock: Add get_free_all_memory_range() Yinghai Lu
2010-07-29 19:45 ` Yinghai Lu
2010-07-29 19:45 ` [PATCH 07/17] x86, memblock: Add memblock_x86_register_active_regions() and memblock_x86_hole_size() Yinghai Lu
2010-07-29 19:45 ` Yinghai Lu
2010-07-29 19:45 ` [PATCH 08/17] memblock: Add find_memory_core_early() Yinghai Lu
2010-07-29 19:45 ` Yinghai Lu
2010-07-29 19:45 ` [PATCH 09/17] x86, memblock: Add memblock_x86_find_in_range_node() Yinghai Lu
2010-07-29 19:45 ` Yinghai Lu
2010-07-29 19:45 ` [PATCH 10/17] x86, memblock: Add memblock_x86_free_memory_in_range() Yinghai Lu
2010-07-29 19:45 ` Yinghai Lu
2010-07-29 19:45 ` [PATCH 11/17] x86, memblock: Add memblock_x86_memory_in_range() Yinghai Lu
2010-07-29 19:45 ` Yinghai Lu
2010-07-29 19:45 ` [PATCH 12/17] x86, memblock: Use memblock_debug to control debug message print out Yinghai Lu
2010-07-29 19:45 ` Yinghai Lu
2010-07-29 19:45 ` [PATCH 13/17] x86: Use memblock to replace early_res Yinghai Lu
2010-07-29 19:45 ` Yinghai Lu
2010-07-29 19:45 ` [PATCH 14/17] x86: Replace e820_/_early string with memblock_ Yinghai Lu
2010-07-29 19:45 ` Yinghai Lu
2010-07-29 19:45 ` [PATCH 15/17] x86: Remove not used early_res code Yinghai Lu
2010-07-29 19:45 ` Yinghai Lu
2010-07-29 19:45 ` [PATCH 16/17] x86, memblock: Use memblock_memory_size()/memblock_free_memory_size() to get correct dma_reserve Yinghai Lu
2010-07-29 19:45 ` Yinghai Lu
2010-07-29 19:45 ` [PATCH 17/17] x86: remove old bootmem code Yinghai Lu
2010-07-29 19:45 ` Yinghai Lu
2010-07-31 7:15 ` [PATCH 01/17 -v2] memblock: Add memblock_free/reserve_reserved_regions() Yinghai Lu
2010-07-31 7:15 ` Yinghai Lu
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=1280432737-1808-2-git-send-email-yinghai@kernel.org \
--to=yinghai@kernel.org \
--cc=akpm@linux-foundation.org \
--cc=davem@davemloft.net \
--cc=hannes@cmpxchg.org \
--cc=hpa@zytor.com \
--cc=linux-arch@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=tglx@linutronix.de \
/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).