diff options
| author | Daniel Kiper <daniel.kiper@oracle.com> | 2012-09-10 13:57:45 +0200 |
|---|---|---|
| committer | Simon Horman <horms@verge.net.au> | 2012-09-18 10:09:45 +0900 |
| commit | 70e8ca565eb810a0494edadb81eebf34500ff1f7 (patch) | |
| tree | f4fbfb9e315aa37d8bcf11471fddc625126892bc | |
| parent | 0dede7a201f63143bb4d0bec7a2f133ab175f68c (diff) | |
| download | kexec-tools-70e8ca565eb810a0494edadb81eebf34500ff1f7.tar.gz | |
kexec: Define some constants and structures conditionally
Some definitions in include/x86/x86-linux.h conflicts
with definitions placed in Xen headers. Make them
conditional. This patch is required by future
Xen kdump fixes.
Signed-off-by: Daniel Kiper <daniel.kiper@oracle.com>
Signed-off-by: Simon Horman <horms@verge.net.au>
| -rw-r--r-- | include/x86/x86-linux.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/include/x86/x86-linux.h b/include/x86/x86-linux.h index 2ebcc3a5..27af02b4 100644 --- a/include/x86/x86-linux.h +++ b/include/x86/x86-linux.h @@ -4,13 +4,17 @@ #define TENATIVE 0 /* Code that is tenatively correct but hasn't yet been officially accepted */ #define E820MAP 0x2d0 /* our map */ -#define E820MAX 128 /* number of entries in E820MAP */ #define E820NR 0x1e8 /* # entries in E820MAP */ +#ifndef E820MAX +#define E820MAX 128 /* number of entries in E820MAP */ +#endif + #ifndef ASSEMBLY #define PACKED __attribute__((packed)) +#ifndef E820_RAM struct e820entry { uint64_t addr; /* start of memory segment */ uint64_t size; /* size of memory segment */ @@ -20,6 +24,7 @@ struct e820entry { #define E820_ACPI 3 /* usable as RAM once ACPI tables have been read */ #define E820_NVS 4 } PACKED; +#endif /* FIXME expand on drive_info_)struct... */ struct drive_info_struct { |