The patch titled kdump: add KEXEC_CRASH_CONTROL_MEMORY_LIMIT has been removed from the -mm tree. Its filename was kdump-add-kexec_crash_control_memory_limit.patch This patch was dropped because it was merged into mainline or a subsystem tree The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: kdump: add KEXEC_CRASH_CONTROL_MEMORY_LIMIT From: Michael Holzheu <holzheu@xxxxxxxxxxxxxxxxxx> On s390 there is a different KEXEC_CONTROL_MEMORY_LIMIT for the normal and the kdump kexec case. Therefore this patch introduces a new macro KEXEC_CRASH_CONTROL_MEMORY_LIMIT. This is set to KEXEC_CONTROL_MEMORY_LIMIT for all architectures that do not define KEXEC_CRASH_CONTROL_MEMORY_LIMIT. Signed-off-by: Michael Holzheu <holzheu@xxxxxxxxxxxxxxxxxx> Acked-by: Vivek Goyal <vgoyal@xxxxxxxxxx> Cc: Martin Schwidefsky <schwidefsky@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- include/linux/kexec.h | 4 ++++ kernel/kexec.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff -puN include/linux/kexec.h~kdump-add-kexec_crash_control_memory_limit include/linux/kexec.h --- a/include/linux/kexec.h~kdump-add-kexec_crash_control_memory_limit +++ a/include/linux/kexec.h @@ -33,6 +33,10 @@ #error KEXEC_ARCH not defined #endif +#ifndef KEXEC_CRASH_CONTROL_MEMORY_LIMIT +#define KEXEC_CRASH_CONTROL_MEMORY_LIMIT KEXEC_CONTROL_MEMORY_LIMIT +#endif + #define KEXEC_NOTE_HEAD_BYTES ALIGN(sizeof(struct elf_note), 4) #define KEXEC_CORE_NOTE_NAME "CORE" #define KEXEC_CORE_NOTE_NAME_BYTES ALIGN(sizeof(KEXEC_CORE_NOTE_NAME), 4) diff -puN kernel/kexec.c~kdump-add-kexec_crash_control_memory_limit kernel/kexec.c --- a/kernel/kexec.c~kdump-add-kexec_crash_control_memory_limit +++ a/kernel/kexec.c @@ -498,7 +498,7 @@ static struct page *kimage_alloc_crash_c while (hole_end <= crashk_res.end) { unsigned long i; - if (hole_end > KEXEC_CONTROL_MEMORY_LIMIT) + if (hole_end > KEXEC_CRASH_CONTROL_MEMORY_LIMIT) break; if (hole_end > crashk_res.end) break; _ Patches currently in -mm which might be from holzheu@xxxxxxxxxxxxxxxxxx are linux-next.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html