From mboxrd@z Thu Jan 1 00:00:00 1970 From: David Vrabel Subject: [PATCH] kexec: provide crashinfo_maxaddr_bits if !CONFIG_KEXEC Date: Mon, 19 Mar 2012 14:15:25 +0000 Message-ID: <1332166525-29333-1-git-send-email-david.vrabel@citrix.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: xen-devel@lists.xensource.com Cc: Andrew Cooper , David Vrabel List-Id: xen-devel@lists.xenproject.org From: David Vrabel Fix the build where !CONFIG_KEXEC (e.g., arm) by providing a default crashinfo_maxaddr_bits. Signed-off-by: David Vrabel --- Andy, A cleaner fix might be to replace MEMF_bits(crashinfo_max_addr_bits) with a function (e.g., crashinfo_mem_flags()), and provide an inline stub when !CONFIG_KEXEC. David --- xen/drivers/char/console.c | 2 -- xen/include/xen/kexec.h | 8 ++++++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/xen/drivers/char/console.c b/xen/drivers/char/console.c index 5cbbf81..e10bed5 100644 --- a/xen/drivers/char/console.c +++ b/xen/drivers/char/console.c @@ -22,9 +22,7 @@ #include #include #include -#ifdef CONFIG_KEXEC #include -#endif #include #include #include /* for do_console_io */ diff --git a/xen/include/xen/kexec.h b/xen/include/xen/kexec.h index 8e9c1d3..b3ca8b0 100644 --- a/xen/include/xen/kexec.h +++ b/xen/include/xen/kexec.h @@ -1,6 +1,8 @@ #ifndef __XEN_KEXEC_H__ #define __XEN_KEXEC_H__ +#ifdef CONFIG_KEXEC + #include #include #include @@ -76,6 +78,12 @@ void vmcoreinfo_append_str(const char *fmt, ...) vmcoreinfo_append_str("OFFSET(%s.%s)=%lu\n", #name, #field, \ (unsigned long)offsetof(struct name, sub.field)) +#else /* !CONFIG_KEXEC */ + +#define crashinfo_maxaddr_bits 0 + +#endif + #endif /* __XEN_KEXEC_H__ */ /* -- 1.7.2.5