From: Simon Horman <horms@verge.net.au>
To: Tony Jones <tonyj@suse.com>
Cc: kexec@lists.infradead.org
Subject: Re: PATCH: fix redefinition error for e820entry
Date: Thu, 6 Feb 2014 16:30:41 +0900 [thread overview]
Message-ID: <20140206073041.GD24865@verge.net.au> (raw)
In-Reply-To: <52F2BD4F.10707@suse.com>
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
prev parent reply other threads:[~2014-02-06 7:31 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-02-05 22:38 PATCH: fix redefinition error for e820entry Tony Jones
2014-02-06 7:30 ` Simon Horman [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20140206073041.GD24865@verge.net.au \
--to=horms@verge.net.au \
--cc=kexec@lists.infradead.org \
--cc=tonyj@suse.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.