* PATCH: fix redefinition error for e820entry
@ 2014-02-05 22:38 Tony Jones
2014-02-06 7:30 ` Simon Horman
0 siblings, 1 reply; 2+ messages in thread
From: Tony Jones @ 2014-02-05 22:38 UTC (permalink / raw)
To: kexec; +Cc: Simon Horman
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>
---
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;
_______________________________________________
kexec mailing list
kexec@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/kexec
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: PATCH: fix redefinition error for e820entry
2014-02-05 22:38 PATCH: fix redefinition error for e820entry Tony Jones
@ 2014-02-06 7:30 ` Simon Horman
0 siblings, 0 replies; 2+ messages in thread
From: Simon Horman @ 2014-02-06 7:30 UTC (permalink / raw)
To: Tony Jones; +Cc: kexec
On Wed, Feb 05, 2014 at 02:38:07PM -0800, Tony Jones wrote:
> 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>
Thanks, applied.
> ---
> 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;
>
> _______________________________________________
> kexec mailing list
> kexec@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/kexec
>
_______________________________________________
kexec mailing list
kexec@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/kexec
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2014-02-06 7:31 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-02-05 22:38 PATCH: fix redefinition error for e820entry Tony Jones
2014-02-06 7:30 ` Simon Horman
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox