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

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

s390/crash: Remove unused KEXEC_NOTE_BYTES 



After commmit 692f66f2 ("crash: move crashkernel parsing and vmcore
related code under CONFIG_CRASH_CORE") the KEXEC_NOTE_BYTES macro is not
used anymore and for s390 we create the ELF header in the new kernel
anyway. Therefore remove the macro.

Reported-by: default avatarXunlei Pang <xpang@redhat.com>
Reviewed-by: default avatarMikhail Zaslonko <zaslonko@linux.vnet.ibm.com>
Signed-off-by: default avatarMichael Holzheu <holzheu@linux.vnet.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent 792e0e00

arch/s390/include/asm/kexec.h

+0 −18
Original line number Diff line number Diff line
@@ -41,24 +41,6 @@ 
/* The native architecture */

#define KEXEC_ARCH KEXEC_ARCH_S390



/*

 * Size for s390x ELF notes per CPU

 *

 * Seven notes plus zero note at the end: prstatus, fpregset, timer,

 * tod_cmp, tod_reg, control regs, and prefix

 */

#define KEXEC_NOTE_BYTES \

	(ALIGN(sizeof(struct elf_note), 4) * 8 + \

	 ALIGN(sizeof("CORE"), 4) * 7 + \

	 ALIGN(sizeof(struct elf_prstatus), 4) + \

	 ALIGN(sizeof(elf_fpregset_t), 4) + \

	 ALIGN(sizeof(u64), 4) + \

	 ALIGN(sizeof(u64), 4) + \

	 ALIGN(sizeof(u32), 4) + \

	 ALIGN(sizeof(u64) * 16, 4) + \

	 ALIGN(sizeof(u32), 4) \

	)



/* Provide a dummy definition to avoid build failures. */

static inline void crash_setup_regs(struct pt_regs *newregs,

					struct pt_regs *oldregs) { }

include/linux/crash_core.h

+5 −0
Original line number Diff line number Diff line
@@ -10,6 +10,11 @@ 
#define CRASH_CORE_NOTE_NAME_BYTES ALIGN(sizeof(CRASH_CORE_NOTE_NAME), 4)

#define CRASH_CORE_NOTE_DESC_BYTES ALIGN(sizeof(struct elf_prstatus), 4)



/*

 * The per-cpu notes area is a list of notes terminated by a "NULL"

 * note header.  For kdump, the code in vmcore.c runs in the context

 * of the second kernel to combine them into one note.

 */

#define CRASH_CORE_NOTE_BYTES	   ((CRASH_CORE_NOTE_HEAD_BYTES * 2) +	\

				     CRASH_CORE_NOTE_NAME_BYTES +	\

				     CRASH_CORE_NOTE_DESC_BYTES)

include/linux/kexec.h

+0 −9
Original line number Diff line number Diff line
@@ -62,15 +62,6 @@ 


#define KEXEC_CORE_NOTE_NAME	CRASH_CORE_NOTE_NAME



/*

 * The per-cpu notes area is a list of notes terminated by a "NULL"

 * note header.  For kdump, the code in vmcore.c runs in the context

 * of the second kernel to combine them into one note.

 */

#ifndef KEXEC_NOTE_BYTES

#define KEXEC_NOTE_BYTES	CRASH_CORE_NOTE_BYTES

#endif



/*

 * This structure is used to hold the arguments that are used when loading

 * kernel binaries.