From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755101Ab1HSOZA (ORCPT ); Fri, 19 Aug 2011 10:25:00 -0400 Received: from mx1.redhat.com ([209.132.183.28]:59542 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753103Ab1HSOY5 (ORCPT ); Fri, 19 Aug 2011 10:24:57 -0400 Date: Fri, 19 Aug 2011 10:24:03 -0400 From: Vivek Goyal To: Michael Holzheu Cc: akpm@linux-foundation.org, ebiederm@xmission.com, mahesh@linux.vnet.ibm.com, hbabu@us.ibm.com, oomichi@mxs.nes.nec.co.jp, horms@verge.net.au, schwidefsky@de.ibm.com, heiko.carstens@de.ibm.com, kexec@lists.infradead.org, linux-kernel@vger.kernel.org, linux-s390@vger.kernel.org Subject: Re: [patch 1/2] kdump: Add KEXEC_CRASH_CONTROL_MEMORY_LIMIT Message-ID: <20110819142403.GF18656@redhat.com> References: <20110819141857.052232873@linux.vnet.ibm.com> <20110819141940.177788593@linux.vnet.ibm.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20110819141940.177788593@linux.vnet.ibm.com> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, Aug 19, 2011 at 04:18:58PM +0200, Michael Holzheu wrote: > From: Michael Holzheu > > 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 Looks good to me. Acked-by: Vivek Goyal 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;