From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Subject: Re: [PATCH] s390/crash: Fix KEXEC_NOTE_BYTES definition References: <1496974625-10891-1-git-send-email-xlpang@redhat.com> From: Hari Bathini Date: Fri, 9 Jun 2017 09:42:10 +0530 MIME-Version: 1.0 In-Reply-To: <1496974625-10891-1-git-send-email-xlpang@redhat.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit Content-Language: en-US Message-Id: <945499f7-3639-d803-adfe-8aa473695488@linux.vnet.ibm.com> Sender: linux-kernel-owner@vger.kernel.org List-Archive: List-Post: To: Xunlei Pang , linux-kernel@vger.kernel.org, kexec@lists.infradead.org Cc: linux-s390@vger.kernel.org, Baoquan He , Gustavo Luiz Duarte , Dave Anderson , Eric Biederman , akpm@linux-foundation.org, Michael Holzheu , Dave Young List-ID: On Friday 09 June 2017 07:47 AM, Xunlei Pang wrote: > S390 KEXEC_NOTE_BYTES is not used by note_buf_t as before, which > is now defined as follows: > typedef u32 note_buf_t[CRASH_CORE_NOTE_BYTES/4]; > It was changed by the CONFIG_CRASH_CORE feature. > > This patch gets rid of all the old KEXEC_NOTE_BYTES stuff, and > renames KEXEC_NOTE_BYTES to CRASH_CORE_NOTE_BYTES for S390. > > Fixes: 692f66f26a4c ("crash: move crashkernel parsing and vmcore related code under CONFIG_CRASH_CORE") > Cc: Dave Young > Cc: Dave Anderson > Cc: Hari Bathini > Cc: Gustavo Luiz Duarte > Signed-off-by: Xunlei Pang > --- > arch/s390/include/asm/kexec.h | 2 +- > include/linux/crash_core.h | 7 +++++++ > include/linux/kexec.h | 11 +---------- > 3 files changed, 9 insertions(+), 11 deletions(-) > > diff --git a/arch/s390/include/asm/kexec.h b/arch/s390/include/asm/kexec.h > index 2f924bc..352deb8 100644 > --- a/arch/s390/include/asm/kexec.h > +++ b/arch/s390/include/asm/kexec.h > @@ -47,7 +47,7 @@ > * Seven notes plus zero note at the end: prstatus, fpregset, timer, > * tod_cmp, tod_reg, control regs, and prefix > */ > -#define KEXEC_NOTE_BYTES \ > +#define CRASH_CORE_NOTE_BYTES \ > (ALIGN(sizeof(struct elf_note), 4) * 8 + \ > ALIGN(sizeof("CORE"), 4) * 7 + \ > ALIGN(sizeof(struct elf_prstatus), 4) + \ > diff --git a/include/linux/crash_core.h b/include/linux/crash_core.h > index e9de6b4..dbc6e5c 100644 > --- a/include/linux/crash_core.h > +++ b/include/linux/crash_core.h > @@ -10,9 +10,16 @@ > #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. > + */ > +#ifndef CRASH_CORE_NOTE_BYTES > #define CRASH_CORE_NOTE_BYTES ((CRASH_CORE_NOTE_HEAD_BYTES * 2) + \ > CRASH_CORE_NOTE_NAME_BYTES + \ > CRASH_CORE_NOTE_DESC_BYTES) > +#endif > > #define VMCOREINFO_BYTES PAGE_SIZE > #define VMCOREINFO_NOTE_NAME "VMCOREINFO" > diff --git a/include/linux/kexec.h b/include/linux/kexec.h > index 3ea8275..133df03 100644 > --- a/include/linux/kexec.h > +++ b/include/linux/kexec.h > @@ -14,7 +14,6 @@ > > #if !defined(__ASSEMBLY__) > > -#include > #include > > #include > @@ -25,6 +24,7 @@ > #include > #include > #include > +#include > > /* Verify architecture specific macros are defined */ > > @@ -63,15 +63,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. > */ Looks good to me. Thanks for the fix.. - Hari