From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from cantor2.suse.de ([195.135.220.15] helo=mx2.suse.de) by bombadil.infradead.org with esmtps (Exim 4.68 #1 (Red Hat Linux)) id 1KJO1w-0004tK-FV for kexec@lists.infradead.org; Thu, 17 Jul 2008 07:36:00 +0000 Date: Thu, 17 Jul 2008 00:30:53 -0700 From: Greg KH Subject: Re: [PATCH] x86: Move crashkernel reservation before dma32_reserve_bootmem() Message-ID: <20080717073053.GD22343@suse.de> References: <1215974984-25184-1-git-send-email-bwalle@suse.de> <20080714133019.GB16673@redhat.com> <20080714153724.228b6dcb@halley.suse.de> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20080714153724.228b6dcb@halley.suse.de> 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-bounces@lists.infradead.org Errors-To: kexec-bounces+dwmw2=infradead.org@lists.infradead.org To: Bernhard Walle Cc: akpm@linux-foundation.org, Bernhard Walle , kexec@lists.infradead.org, x86@kernel.org, Vivek Goyal On Mon, Jul 14, 2008 at 03:37:24PM +0200, Bernhard Walle wrote: > * Vivek Goyal [2008-07-14 09:30]: > > > > On Sun, Jul 13, 2008 at 08:49:44PM +0200, Bernhard Walle wrote: > > > From: Bernhard Walle > > > > > > On a x86-64 machine (nothing special I could encounter) I had the problem that > > > crashkernel reservation with the usual "64M@16M" failed. While debugging that, > > > I encountered that dma32_reserve_bootmem() reserves a memory region which is in > > > that area. > > > > > > Because dma32_reserve_bootmem() does not rely on a specific offset but > > > crashkernel does, it makes sense to move the crashkernel reservation up a bit. > > > I tested that patch and it works without problems. I don't see any negative > > > effects of that move, but maybe I oversaw something ... > > > > > > While the long-term solution is to make the crashkernel reservation dynamic > > > (which is already done in -tip), this bug should be fixed also short-term for > > > 2.6.26 (or 2.6.26-stable if it's too short), and that's why I made that patch. > > > > > > > > > Signed-off-by: Bernhard Walle > > > Signed-off-by: Bernhard Walle > > > --- > > > arch/x86/kernel/setup_64.c | 7 ++++++- > > > 1 files changed, 6 insertions(+), 1 deletions(-) > > > > > > diff --git a/arch/x86/kernel/setup_64.c b/arch/x86/kernel/setup_64.c > > > index 6dff128..158cefe 100644 > > > --- a/arch/x86/kernel/setup_64.c > > > +++ b/arch/x86/kernel/setup_64.c > > > @@ -444,6 +444,12 @@ void __init setup_arch(char **cmdline_p) > > > contig_initmem_init(0, end_pfn); > > > #endif > > > > > > + /* > > > + * dma32_reserve_bootmem() allocates bootmem which may conflict > > > + * with the crashkernel command line, so do that before > > > + */ > > > + reserve_crashkernel(); > > > + > > > dma32_reserve_bootmem(); > > > > > > #ifdef CONFIG_ACPI_SLEEP > > > @@ -484,7 +490,6 @@ void __init setup_arch(char **cmdline_p) > > > } > > > } > > > #endif > > > - reserve_crashkernel(); > > > > > > reserve_ibft_region(); > > > > Looks good to me. > > > > Acked-by: Vivek Goyal > > Greg, > > would that be something for -stable? If it affects 2.6.25 or 2.6.26, yes, it would be. Just send it to stable@kernel.org and we can take it from there as long as it is accepted already into Linus's tree. thanks, greg k-h _______________________________________________ kexec mailing list kexec@lists.infradead.org http://lists.infradead.org/mailman/listinfo/kexec