diff options
| author | Tony Jones <tonyj@suse.com> | 2014-02-05 14:38:07 -0800 |
|---|---|---|
| committer | Simon Horman <horms@verge.net.au> | 2014-02-06 16:28:34 +0900 |
| commit | 941fa1f6e31bc7cb1b014277de36b80425da7010 (patch) | |
| tree | c1ac2679b99346f4a5243b6b3f7d3844d6b314fe | |
| parent | 9bcefc97bc6c03b6acc8c25f6b1d4e796521ea4c (diff) | |
i386: fix redefinition error for e820entry
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>
| -rw-r--r-- | kexec/arch/i386/crashdump-x86.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/kexec/arch/i386/crashdump-x86.c b/kexec/arch/i386/crashdump-x86.c index 53bd077..979c2bd 100644 --- 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; |