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>

diff --git a/arch/s390/include/asm/kexec.h b/arch/s390/include/asm/kexec.h
index 2f924bc30e358542201bdde082ab6d0289f3403c..dccf24ee26d3d3a7ae9449dd247ccca2c3beb110 100644 (file)
--- a/arch/s390/include/asm/kexec.h
+++ b/arch/s390/include/asm/kexec.h
@@ -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) { }

diff --git a/include/linux/crash_core.h b/include/linux/crash_core.h
index 541a197ba4a2107af28dfed68a2625e7bebf8f7c..4090a42578a8f4b047930508d5655b603c31bdd5 100644 (file)
--- a/include/linux/crash_core.h
+++ b/include/linux/crash_core.h
@@ -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)

diff --git a/include/linux/kexec.h b/include/linux/kexec.h
index c9481ebcbc0cab09429bde237f21e41cc7dcb061..65888418fb694df2d2cb93531ca5139905dd537a 100644 (file)
--- a/include/linux/kexec.h
+++ b/include/linux/kexec.h
@@ -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.