The patch titled
Use extended crashkernel command line on x86_64 (update)
has been removed from the -mm tree. Its filename was
use-extended-crashkernel-command-line-on-x86_64-update.patch
This patch was dropped because it was folded into
use-extended-crashkernel-command-line-on-x86_64.patch
------------------------------------------------------
Subject: Use extended crashkernel command line on x86_64 (update)
From: Bernhard Walle <[EMAIL PROTECTED]>
This patch removes the crashkernel parsing from
arch/x86_64/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_64.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff -puN
arch/x86/kernel/setup_64.c~use-extended-crashkernel-command-line-on-x86_64-update
arch/x86/kernel/setup_64.c
---
a/arch/x86/kernel/setup_64.c~use-extended-crashkernel-command-line-on-x86_64-update
+++ a/arch/x86/kernel/setup_64.c
@@ -194,11 +194,11 @@ static inline void copy_edd(void)
#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 free_mem;
+ unsigned long long crash_size, crash_base;
+ int ret;
- free_mem = max_low_pfn << PAGE_SHIFT;
+ free_mem = ((unsigned long long)max_low_pfn - min_low_pfn) <<
PAGE_SHIFT;
ret = parse_crashkernel(boot_command_line, free_mem,
&crash_size, &crash_base);
_
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-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
