From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757198AbYHMRIa (ORCPT ); Wed, 13 Aug 2008 13:08:30 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753328AbYHMRIW (ORCPT ); Wed, 13 Aug 2008 13:08:22 -0400 Received: from smtp1.linux-foundation.org ([140.211.169.13]:53975 "EHLO smtp1.linux-foundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751600AbYHMRIV (ORCPT ); Wed, 13 Aug 2008 13:08:21 -0400 Date: Wed, 13 Aug 2008 10:07:03 -0700 From: Andrew Morton To: Vivek Goyal Cc: Huang Ying , "Eric W. Biederman" , Pavel Machek , nigel@nigel.suspend2.net, "Rafael J. Wysocki" , mingo@elte.hu, Linus Torvalds , linux-kernel@vger.kernel.org, Kexec Mailing List Subject: Re: [PATCH] kexec jump: fix code size checking Message-Id: <20080813100703.10f50b40.akpm@linux-foundation.org> In-Reply-To: <20080813131927.GB3957@redhat.com> References: <1218589475.24951.59.camel@caritas-dev.intel.com> <20080813131927.GB3957@redhat.com> X-Mailer: Sylpheed 2.4.8 (GTK+ 2.12.5; x86_64-redhat-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, 13 Aug 2008 09:19:27 -0400 Vivek Goyal wrote: > On Wed, Aug 13, 2008 at 09:04:35AM +0800, Huang Ying wrote: > > Fix building issue when CONFIG_KEXEC=n. Thanks to Vivek Goyal for his > > reminding. > > > > Signed-off-by: Huang Ying > > > > --- > > include/asm-x86/kexec.h | 3 +++ > > 1 file changed, 3 insertions(+) > > > > --- a/include/asm-x86/kexec.h > > +++ b/include/asm-x86/kexec.h > > @@ -43,6 +43,9 @@ > > > > #ifdef CONFIG_X86_32 > > # define KEXEC_CONTROL_CODE_MAX_SIZE 2048 > > +# ifndef CONFIG_KEXEC > > +# define kexec_control_code_size 0 > > +# endif > > #endif > > > > #ifndef __ASSEMBLY__ > > I think Andrew already fixed it. Right way is to put code in vmlinux.lds.S > under #ifdef CONFIG_KEXEC, than defining the symbol kexec_control_code_size > if CONFIG_KEXEC=n I was wondering about that. I resurrected that patch.