On Fri, Aug 19, 2011 at 04:18:58PM +0200, Michael Holzheu wrote: > From: Michael Holzheu <[email protected]> > > 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. > > Signed-off-by: Michael Holzheu <[email protected]>
Looks good to me. Acked-by: Vivek Goyal <[email protected]> Vivek > --- > include/linux/kexec.h | 4 ++++ > kernel/kexec.c | 2 +- > 2 files changed, 5 insertions(+), 1 deletion(-) > > --- a/include/linux/kexec.h > +++ b/include/linux/kexec.h > @@ -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) > --- a/kernel/kexec.c > +++ b/kernel/kexec.c > @@ -498,7 +498,7 @@ static struct page *kimage_alloc_crash_c > 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; _______________________________________________ kexec mailing list [email protected] http://lists.infradead.org/mailman/listinfo/kexec
