[Xen-changelog] [xen-unstable] kexec: provide crashinfo_maxaddr_bits if !CONFIG_KEXEC

[Xen patchbot-unstable <patchbot@xxxxxxx>]

# HG changeset patch
# User David Vrabel <david.vrabel@xxxxxxxxxx>
# Date 1332411541 0
# Node ID a0aad46225ac94ec341d2667fd91e2c1f9362a3e
# Parent  6fde5df8b8501c22e959f6b3510e7c775ac1d385
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@xxxxxxxxxx>
Committed-by: Keir Fraser <keir@xxxxxxx>
---


diff -r 6fde5df8b850 -r a0aad46225ac xen/drivers/char/console.c
--- a/xen/drivers/char/console.c        Thu Mar 22 10:18:12 2012 +0000
+++ b/xen/drivers/char/console.c        Thu Mar 22 10:19:01 2012 +0000
@@ -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 -r 6fde5df8b850 -r a0aad46225ac xen/include/xen/kexec.h
--- a/xen/include/xen/kexec.h   Thu Mar 22 10:18:12 2012 +0000
+++ b/xen/include/xen/kexec.h   Thu Mar 22 10:19:01 2012 +0000
@@ -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 @@
        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__ */
 
 /*

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog