PATCH: fix redefinition error for e820entry
Subsystems (2)
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 <[email protected]>
--- kexec/arch/i386/crashdump-x86.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
kexec/arch/i386/crashdump-x86.c +2 -1
@@ -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;
_______________________________________________
kexec mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/kexec
Simon Horman
AppliedQuoted 4 lines · Tony Jones
At least on our systems,
xenctrl.hdefines (unguarded) struct e820entry Move the (guarded) definition ininclude/x86/x86-linux.hto below.Signed-off-by Tony Jones <[email protected]>
Thanks, applied.
Quoted 22 lines
--- kexec/arch/i386/crashdump-x86.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)kexec/arch/i386/crashdump-x86.c +2
-1@@ -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;
Quoted 5 lines
_______________________________________________
kexec mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/kexec
_______________________________________________
kexec mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/kexec