cd3d9e04cf
OBS-URL: https://build.opensuse.org/request/show/223425 OBS-URL: https://build.opensuse.org/package/show/Kernel:kdump/kexec-tools?expand=0&rev=39
33 lines
869 B
Diff
33 lines
869 B
Diff
From: Tony Jones <tonyj@suse.de>
|
|
Subject: fix redefinition error for e820
|
|
Upstream: yes
|
|
Git-commit: 941fa1f6e31bc7cb1b014277de36b80425da7010
|
|
|
|
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@suse.de>
|
|
Signed-off-by: Simon Horman <horms@verge.net.au>
|
|
|
|
---
|
|
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;
|