Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3d214fae authored by Michael Holzheu's avatar Michael Holzheu Committed by Martin Schwidefsky
Browse files

[S390] kdump: Add KEXEC_CRASH_CONTROL_MEMORY_LIMIT 



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.

Acked-by: default avatarVivek Goyal <vgoyal@redhat.com>
Acked-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarMichael Holzheu <holzheu@linux.vnet.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent 80853a8a

include/linux/kexec.h

+4 −0
Original line number Diff line number Diff line
@@ -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)

kernel/kexec.c

+1 −1
Original line number Diff line number Diff line
@@ -498,7 +498,7 @@ static struct page *kimage_alloc_crash_control_pages(struct kimage *image, 
	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;