Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

s390/crash: Remove unused KEXEC_NOTE_BYTES

After commmit 692f66f26a4c19 ("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: Xunlei Pang <xpang@redhat.com>
Reviewed-by: Mikhail Zaslonko <zaslonko@linux.vnet.ibm.com>
Signed-off-by: Michael Holzheu <holzheu@linux.vnet.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>

authored by

Michael Holzheu and committed by
Martin Schwidefsky
cd0ae1d3 792e0e00

+5 -27
-18
arch/s390/include/asm/kexec.h
··· 41 41 /* The native architecture */ 42 42 #define KEXEC_ARCH KEXEC_ARCH_S390 43 43 44 - /* 45 - * Size for s390x ELF notes per CPU 46 - * 47 - * Seven notes plus zero note at the end: prstatus, fpregset, timer, 48 - * tod_cmp, tod_reg, control regs, and prefix 49 - */ 50 - #define KEXEC_NOTE_BYTES \ 51 - (ALIGN(sizeof(struct elf_note), 4) * 8 + \ 52 - ALIGN(sizeof("CORE"), 4) * 7 + \ 53 - ALIGN(sizeof(struct elf_prstatus), 4) + \ 54 - ALIGN(sizeof(elf_fpregset_t), 4) + \ 55 - ALIGN(sizeof(u64), 4) + \ 56 - ALIGN(sizeof(u64), 4) + \ 57 - ALIGN(sizeof(u32), 4) + \ 58 - ALIGN(sizeof(u64) * 16, 4) + \ 59 - ALIGN(sizeof(u32), 4) \ 60 - ) 61 - 62 44 /* Provide a dummy definition to avoid build failures. */ 63 45 static inline void crash_setup_regs(struct pt_regs *newregs, 64 46 struct pt_regs *oldregs) { }
+5
include/linux/crash_core.h
··· 10 10 #define CRASH_CORE_NOTE_NAME_BYTES ALIGN(sizeof(CRASH_CORE_NOTE_NAME), 4) 11 11 #define CRASH_CORE_NOTE_DESC_BYTES ALIGN(sizeof(struct elf_prstatus), 4) 12 12 13 + /* 14 + * The per-cpu notes area is a list of notes terminated by a "NULL" 15 + * note header. For kdump, the code in vmcore.c runs in the context 16 + * of the second kernel to combine them into one note. 17 + */ 13 18 #define CRASH_CORE_NOTE_BYTES ((CRASH_CORE_NOTE_HEAD_BYTES * 2) + \ 14 19 CRASH_CORE_NOTE_NAME_BYTES + \ 15 20 CRASH_CORE_NOTE_DESC_BYTES)
-9
include/linux/kexec.h
··· 63 63 #define KEXEC_CORE_NOTE_NAME CRASH_CORE_NOTE_NAME 64 64 65 65 /* 66 - * The per-cpu notes area is a list of notes terminated by a "NULL" 67 - * note header. For kdump, the code in vmcore.c runs in the context 68 - * of the second kernel to combine them into one note. 69 - */ 70 - #ifndef KEXEC_NOTE_BYTES 71 - #define KEXEC_NOTE_BYTES CRASH_CORE_NOTE_BYTES 72 - #endif 73 - 74 - /* 75 66 * This structure is used to hold the arguments that are used when loading 76 67 * kernel binaries. 77 68 */