From 5823a8d7bfebf2519b8ed5b979efd24b31320137 Mon Sep 17 00:00:00 2001
From: David Vrabel <david.vrabel@citrix.com>
Date: Thu, 22 Mar 2012 10:19:01 +0000
Subject: [PATCH] kexec: provide crashinfo_maxaddr_bits if !CONFIG_KEXEC

Fix the build where !CONFIG_KEXEC (e.g., arm) by providing a default
crashinfo_maxaddr_bits.

Signed-off-by: David Vrabel <david.vrabel@citrix.com>
Committed-by: Keir Fraser <keir@xen.org>
---
 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 5cbbf814ad..e10bed5d55 100644
--- a/xen/drivers/char/console.c
+++ b/xen/drivers/char/console.c
@@ -22,9 +22,7 @@
 #include <xen/guest_access.h>
 #include <xen/shutdown.h>
 #include <xen/vga.h>
-#ifdef CONFIG_KEXEC
 #include <xen/kexec.h>
-#endif
 #include <asm/debugger.h>
 #include <asm/div64.h>
 #include <xen/hypercall.h> /* for do_console_io */
diff --git a/xen/include/xen/kexec.h b/xen/include/xen/kexec.h
index 8e9c1d36d9..b3ca8b0803 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 <public/kexec.h>
 #include <asm/percpu.h>
 #include <xen/elfcore.h>
@@ -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__ */
 
 /*
-- 
2.39.5