From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Kiper Subject: [PATCH 1/7] kexec: Define some constants and structures conditionally Date: Mon, 10 Sep 2012 13:57:45 +0200 Message-ID: <1347278271-5211-2-git-send-email-daniel.kiper@oracle.com> References: <1347278271-5211-1-git-send-email-daniel.kiper@oracle.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1347278271-5211-1-git-send-email-daniel.kiper-QHcLZuEGTsvQT0dZR+AlfA@public.gmane.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: kexec-bounces-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org Errors-To: kexec-bounces+glkk-kexec=m.gmane.org-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org To: konrad.wilk-QHcLZuEGTsvQT0dZR+AlfA@public.gmane.org, andrew.cooper3-Sxgqhf6Nn4DQT0dZR+AlfA@public.gmane.org, olaf-QOLJcTWqO2uzQB+pC5nmwQ@public.gmane.org, jbeulich-IBi9RG/b67k@public.gmane.org, ptesarik-AlSwsSmVLrQ@public.gmane.org, kexec-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org, xen-devel-GuqFBffKawuULHF6PoxzQEEOCMrvLtNR@public.gmane.org List-Id: xen-devel@lists.xenproject.org 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 --- 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 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 { -- 1.5.6.5