diff options
| author | Simon Horman <horms@verge.net.au> | 2015-11-27 09:30:13 +0900 |
|---|---|---|
| committer | Simon Horman <horms@verge.net.au> | 2015-11-27 09:35:41 +0900 |
| commit | 6ba9e97c5b5f059c11b87f5f21f55bd92dcf1f2d (patch) | |
| tree | cfa7334214b054bf09f5ccb9c84df47a60b890e6 | |
| parent | 56a12abc1df1a019327c8958f6346f53935ec3fc (diff) | |
x86: Make sure E820_PM[AE]M are defined if needed
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>
| -rw-r--r-- | kexec/arch/i386/kexec-x86-common.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/kexec/arch/i386/kexec-x86-common.c b/kexec/arch/i386/kexec-x86-common.c index b308e47..3e97239 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 + static struct memory_range memory_range[MAX_MEMORY_RANGES]; /** |