From 70e8ca565eb810a0494edadb81eebf34500ff1f7 Mon Sep 17 00:00:00 2001 From: Daniel Kiper Date: Mon, 10 Sep 2012 13:57:45 +0200 Subject: 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 Signed-off-by: Simon Horman --- include/x86/x86-linux.h | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'include/x86') diff --git a/include/x86/x86-linux.h b/include/x86/x86-linux.h index 2ebcc3a..27af02b 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 { -- cgit