PATCH: fix redefinition error for e820entry

Tony Jones tonyj at suse.com
Wed Feb 5 17:38:07 EST 2014


At least on our systems, xenctrl.h defines (unguarded) struct e820entry
Move the (guarded) definition in include/x86/x86-linux.h to below.

Signed-off-by: Tony Jones <tonyj at suse.de>
---
 kexec/arch/i386/crashdump-x86.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

--- a/kexec/arch/i386/crashdump-x86.c
+++ b/kexec/arch/i386/crashdump-x86.c
@@ -41,12 +41,13 @@
 #include "../../crashdump.h"
 #include "kexec-x86.h"
 #include "crashdump-x86.h"
-#include "x86-linux-setup.h"

 #ifdef HAVE_LIBXENCTRL
 #include <xenctrl.h>
 #endif /* HAVE_LIBXENCTRL */

+#include "x86-linux-setup.h"
+
 #include <x86/x86-linux.h>

 extern struct arch_options_t arch_options;



More information about the kexec mailing list