From: Simon Horman <horms@verge.net.au>
To: Baoquan He <bhe@redhat.com>
Cc: Michael Holzheu <holzheu@linux.vnet.ibm.com>,
kexec@lists.infradead.org, Petr Tesarik <ptesarik@suse.com>
Subject: Re: [PATCH] x86: Make sure E820_PM[AE]M are defined if needed
Date: Mon, 30 Nov 2015 08:53:22 +0900 [thread overview]
Message-ID: <20151129235322.GA13342@verge.net.au> (raw)
In-Reply-To: <20151127065847.GF13853@dhcp-128-28.nay.redhat.com>
On Fri, Nov 27, 2015 at 02:58:47PM +0800, Baoquan He wrote:
> On 11/27/15 at 09:36am, Simon Horman wrote:
> > It appears that (older?) revisions of xenctl.h define
> > all of the E820_* values used in kexec-x86-common.c except
> > E820_PMAM and E820_PMEM. This results in a build failure when
> > building against libxenctl.
> >
> > Avoid this problem by providing local definitions of those values.
> >
> > It seems reasonable to do so in the kexec-x86-common.c as
> > currently that is the only source file that uses the values in question.
> >
> > Fixes: 56a12abc1df1 ("kexec: fix mmap return code handling")
> > Cc: Michael Holzheu <holzheu@linux.vnet.ibm.com>
> > Cc: Petr Tesarik <ptesarik@suse.com>
> > Cc: Baoquan He <bhe@redhat.com>
> > Signed-off-by: Simon Horman <horms@verge.net.au>
> > ---
> > kexec/arch/i386/kexec-x86-common.c | 6 ++++++
> > 1 file changed, 6 insertions(+)
> >
> > diff --git a/kexec/arch/i386/kexec-x86-common.c b/kexec/arch/i386/kexec-x86-common.c
> > index b308e4719503..3e97239c0c78 100644
> > --- a/kexec/arch/i386/kexec-x86-common.c
> > +++ b/kexec/arch/i386/kexec-x86-common.c
> > @@ -44,6 +44,12 @@
> > #include <xenctrl.h>
> > #endif /* HAVE_LIBXENCTRL */
> >
> > +/* Used below but not present in (older?) xenctrl.h */
> > +#ifndef E820_PMEM
> > +#define E820_PMEM 7
> > +#define E820_PRAM 12
> > +#endif
> > +
>
> It looks very ugly but seems no better way to do it.
Agreed. I've applied this change.
_______________________________________________
kexec mailing list
kexec@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/kexec
prev parent reply other threads:[~2015-11-29 23:53 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-11-27 0:36 [PATCH] x86: Make sure E820_PM[AE]M are defined if needed Simon Horman
2015-11-27 6:58 ` Baoquan He
2015-11-29 23:53 ` 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=20151129235322.GA13342@verge.net.au \
--to=horms@verge.net.au \
--cc=bhe@redhat.com \
--cc=holzheu@linux.vnet.ibm.com \
--cc=kexec@lists.infradead.org \
--cc=ptesarik@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox