The patch titled
Use extended crashkernel command line on i386 (update)
has been removed from the -mm tree. Its filename was
use-extended-crashkernel-command-line-on-i386-update.patch
This patch was dropped because it was folded into
use-extended-crashkernel-command-line-on-i386.patch
------------------------------------------------------
Subject: Use extended crashkernel command line on i386 (update)
From: Bernhard Walle <[EMAIL PROTECTED]>
This patch removes the crashkernel parsing from
arch/i386/kernel/machine_kexec.c and calls the generic function, introduced in
the last patch, in setup_bootmem_allocator().
This is necessary because the amount of System RAM must be known in this
function now because of the new syntax.
Signed-off-by: Bernhard Walle <[EMAIL PROTECTED]>
Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
---
arch/x86/kernel/setup_32.c | 29 ++++++++++++++---------------
1 file changed, 14 insertions(+), 15 deletions(-)
diff -puN
arch/x86/kernel/setup_32.c~use-extended-crashkernel-command-line-on-i386-update
arch/x86/kernel/setup_32.c
---
a/arch/x86/kernel/setup_32.c~use-extended-crashkernel-command-line-on-i386-update
+++ a/arch/x86/kernel/setup_32.c
@@ -378,29 +378,28 @@ extern unsigned long __init setup_memory
extern void zone_sizes_init(void);
#endif /* !CONFIG_NEED_MULTIPLE_NODES */
-#ifdef CONFIG_HIGHMEM
-static inline unsigned long long get_total_mem(void)
-{
- return (unsigned long long)
- (max_low_pfn + highend_pfn - highstart_pfn) << PAGE_SHIFT;
-}
-#else
static inline unsigned long long get_total_mem(void)
{
- return (unsigned long long)max_low_pfn << PAGE_SHIFT;
-}
+ unsigned long long total;
+
+ total = max_low_pfn - min_low_pfn;
+#ifdef CONFIG_HIGHMEM
+ total += highend_pfn - highstart_pfn;
#endif
+ return total << PAGE_SHIFT;
+}
+
#ifdef CONFIG_KEXEC
static void __init reserve_crashkernel(void)
{
- unsigned long long free_mem;
- unsigned long long crash_size, crash_base;
- int ret;
+ unsigned long long total_mem;
+ unsigned long long crash_size, crash_base;
+ int ret;
- free_mem = get_total_mem();
+ total_mem = get_total_mem();
- ret = parse_crashkernel(boot_command_line, free_mem,
+ ret = parse_crashkernel(boot_command_line, total_mem,
&crash_size, &crash_base);
if (ret == 0 && crash_size > 0) {
if (crash_base > 0) {
@@ -408,7 +407,7 @@ static void __init reserve_crashkernel(v
"for crashkernel (System RAM: %ldMB)\n",
(unsigned long)(crash_size >> 20),
(unsigned long)(crash_base >> 20),
- (unsigned long)(free_mem >> 20));
+ (unsigned long)(total_mem >> 20));
crashk_res.start = crash_base;
crashk_res.end = crash_base + crash_size - 1;
reserve_bootmem(crash_base, crash_size);
_
Patches currently in -mm which might be from [EMAIL PROTECTED] are
origin.patch
extended-crashkernel-command-line.patch
use-extended-crashkernel-command-line-on-i386.patch
use-extended-crashkernel-command-line-on-i386-update.patch
use-extended-crashkernel-command-line-on-x86_64.patch
use-extended-crashkernel-command-line-on-x86_64-update.patch
use-extended-crashkernel-command-line-on-ia64.patch
use-extended-crashkernel-command-line-on-ia64-fix.patch
use-extended-crashkernel-command-line-on-ia64-update.patch
use-extended-crashkernel-command-line-on-ppc64.patch
use-extended-crashkernel-command-line-on-ppc64-update.patch
use-extended-crashkernel-command-line-on-sh.patch
use-extended-crashkernel-command-line-on-sh-update.patch
add-documentation-for-extended-crashkernel-syntax.patch
add-documentation-for-extended-crashkernel-syntax-add-extended-crashkernel-syntax-to-kernel-parameterstxt.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
