From: Mika Westerberg <mika.westerberg@iki.fi>
To: linux-arm-kernel@lists.infradead.org
Cc: akpm@linux-foundation.org, linux-kernel@vger.kernel.org,
Mika Westerberg <mika.westerberg@iki.fi>
Subject: [PATCH 4/4] ARM: memblock: convert reserve_crashkernel() to use memblock
Date: Tue, 9 Nov 2010 11:06:13 +0200 [thread overview]
Message-ID: <07f23b6e32b1ee64287dc53803890052df6546f3.1289292124.git.mika.westerberg@iki.fi> (raw)
In-Reply-To: <cover.1289292124.git.mika.westerberg@iki.fi>
In-Reply-To: <cover.1289292124.git.mika.westerberg@iki.fi>
Since we now use memblock we can convert reserve_crashkernel() to
take advantage of the memblock API.
While we are at it, fix the typo in the function kerneldoc as well.
Signed-off-by: Mika Westerberg <mika.westerberg@iki.fi>
---
arch/arm/kernel/setup.c | 21 +++++++--------------
1 files changed, 7 insertions(+), 14 deletions(-)
diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c
index 336f14e..c477a2e 100644
--- a/arch/arm/kernel/setup.c
+++ b/arch/arm/kernel/setup.c
@@ -720,16 +720,8 @@ static int __init customize_machine(void)
arch_initcall(customize_machine);
#ifdef CONFIG_KEXEC
-static inline unsigned long long get_total_mem(void)
-{
- unsigned long total;
-
- total = max_low_pfn - min_low_pfn;
- return total << PAGE_SHIFT;
-}
-
/**
- * reserve_crashkernel() - reserves memory are for crash kernel
+ * reserve_crashkernel() - reserves memory area for crash kernel
*
* This function reserves memory area given in "crashkernel=" kernel command
* line parameter. The memory reserved is used by a dump capture kernel when
@@ -738,16 +730,17 @@ static inline unsigned long long get_total_mem(void)
static void __init reserve_crashkernel(void)
{
unsigned long long crash_size, crash_base;
- unsigned long long total_mem;
int ret;
- total_mem = get_total_mem();
- ret = parse_crashkernel(boot_command_line, total_mem,
+ /* this is necessary because of memblock_phys_mem_size() */
+ memblock_analyze();
+
+ ret = parse_crashkernel(boot_command_line, memblock_phys_mem_size(),
&crash_size, &crash_base);
if (ret)
return;
- ret = reserve_bootmem(crash_base, crash_size, BOOTMEM_EXCLUSIVE);
+ ret = memblock_reserve(crash_base, crash_size);
if (ret < 0) {
printk(KERN_WARNING "crashkernel reservation failed - "
"memory is in use (0x%lx)\n", (unsigned long)crash_base);
@@ -758,7 +751,7 @@ static void __init reserve_crashkernel(void)
"for crashkernel (System RAM: %ldMB)\n",
(unsigned long)(crash_size >> 20),
(unsigned long)(crash_base >> 20),
- (unsigned long)(total_mem >> 20));
+ (unsigned long)(memblock_phys_mem_size() >> 20));
crashk_res.start = crash_base;
crashk_res.end = crash_base + crash_size - 1;
--
1.7.2.3
next prev parent reply other threads:[~2010-11-09 9:07 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-11-09 9:06 [PATCH 0/4] ARM kdump fixes Mika Westerberg
2010-11-09 9:06 ` [PATCH 1/4] proc/vmcore: allow archs to override vmcore_elf_check_arch() Mika Westerberg
2010-11-15 7:53 ` Mika Westerberg
2010-11-16 22:28 ` Andrew Morton
2010-11-16 22:50 ` Russell King - ARM Linux
2010-11-17 10:52 ` Mika Westerberg
2010-11-26 11:02 ` Russell King - ARM Linux
2010-11-09 9:06 ` [PATCH 2/4] ARM: provide zero vmcore_elf64_check_arch() Mika Westerberg
2010-11-09 9:06 ` [PATCH 3/4] ARM: add CONFIG_CRASH_DUMP to Kconfig Mika Westerberg
2010-11-09 9:06 ` Mika Westerberg [this message]
2010-11-13 13:07 ` [PATCH 4/4] ARM: memblock: convert reserve_crashkernel() to use memblock Russell King - ARM Linux
2010-11-14 8:25 ` Mika Westerberg
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=07f23b6e32b1ee64287dc53803890052df6546f3.1289292124.git.mika.westerberg@iki.fi \
--to=mika.westerberg@iki.fi \
--cc=akpm@linux-foundation.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
/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).