From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from mx1.redhat.com ([209.132.183.28]) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1WiP63-0002EV-TL for kexec@lists.infradead.org; Thu, 08 May 2014 14:14:52 +0000 Date: Thu, 8 May 2014 10:14:29 -0400 From: Vivek Goyal Subject: Re: [PATCH RESEND] condition check fix Message-ID: <20140508141429.GD9224@redhat.com> References: <1399548377-10417-1-git-send-email-chaowang@redhat.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <1399548377-10417-1-git-send-email-chaowang@redhat.com> List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "kexec" Errors-To: kexec-bounces+dwmw2=infradead.org@lists.infradead.org To: WANG Chao Cc: horms@verge.net.au, kexec@lists.infradead.org On Thu, May 08, 2014 at 07:26:17PM +0800, WANG Chao wrote: > In commit 91f5b9c ("kdump: pass e820 reserved region to 2nd kernel via > e820 table or setup_data"), I made a wrong condition check. > > We should only add cmdline for a memory range if --pass-memmap-cmdline > and the range type isn't RANGE_RESERVED. > > Signed-off-by: WANG Chao Ok, this fixes the issue for me. Thanks. Acked-by: Vivek Goyal BTW, on a related note, I see that we are doing GART check two times. } else if (memcmp(str, "GART\n", 5) == 0) { } else if (memcmp(str, "GART\n", 5) == 0) { I am not sure if it is due to your patches or not. Thanks Vivek > --- > kexec/arch/i386/crashdump-x86.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/kexec/arch/i386/crashdump-x86.c b/kexec/arch/i386/crashdump-x86.c > index cc33347..999a837 100644 > --- a/kexec/arch/i386/crashdump-x86.c > +++ b/kexec/arch/i386/crashdump-x86.c > @@ -1000,7 +1000,7 @@ int load_crashdump_segments(struct kexec_info *info, char* mod_cmdline, > type = mem_range[i].type; > size = end - start + 1; > add_memmap(memmap_p, &nr_memmap, start, size, type); > - if (arch_options.pass_memmap_cmdline || type != RANGE_RESERVED) > + if (arch_options.pass_memmap_cmdline && type != RANGE_RESERVED) > cmdline_add_memmap_acpi(mod_cmdline, start, end); > } > > -- > 1.9.0 _______________________________________________ kexec mailing list kexec@lists.infradead.org http://lists.infradead.org/mailman/listinfo/kexec