forked from pool/kexec-tools
28 lines
627 B
Diff
28 lines
627 B
Diff
|
From: Tony Jones <tonyj@suse.de>
|
||
|
|
Subject: fix redefinition error for e820
|
||
|
|
Upstream: pending
|
||
|
|
|
||
|
|
Our xenctrl.h duplicates e820 definition.
|
||
|
|
|
||
|
|
---
|
||
|
|
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;
|