From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from smtp02.citrix.com ([66.165.176.63]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1VKCta-0004rt-Hi for kexec@lists.infradead.org; Thu, 12 Sep 2013 19:49:43 +0000 From: David Vrabel Subject: [PATCH 1/9] x86: give FIX_EFI_MPF its own fixmap entry Date: Thu, 12 Sep 2013 20:48:59 +0100 Message-ID: <1379015347-21653-2-git-send-email-david.vrabel@citrix.com> In-Reply-To: <1379015347-21653-1-git-send-email-david.vrabel@citrix.com> References: <1379015347-21653-1-git-send-email-david.vrabel@citrix.com> MIME-Version: 1.0 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "kexec" Errors-To: kexec-bounces+dwmw2=twosheds.infradead.org@lists.infradead.org To: xen-devel@lists.xen.org Cc: kexec@lists.infradead.org, Daniel Kiper , Keir Fraser , David Vrabel , Jan Beulich From: David Vrabel FIX_EFI_MPF was the same as FIX_KEXEC_BASE_0 which is going away. So add its own entry. Signed-off-by: David Vrabel Reviewed-by: Daniel Kiper Tested-by: Daniel Kiper --- xen/arch/x86/mpparse.c | 2 -- xen/include/asm-x86/fixmap.h | 1 + 2 files changed, 1 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/mpparse.c b/xen/arch/x86/mpparse.c index 97d34bc..3753704 100644 --- a/xen/arch/x86/mpparse.c +++ b/xen/arch/x86/mpparse.c @@ -538,8 +538,6 @@ static inline void __init construct_default_ISA_mptable(int mpc_default_type) } } -#define FIX_EFI_MPF FIX_KEXEC_BASE_0 - static __init void efi_unmap_mpf(void) { if (efi_enabled) diff --git a/xen/include/asm-x86/fixmap.h b/xen/include/asm-x86/fixmap.h index d850be4..8b4266d 100644 --- a/xen/include/asm-x86/fixmap.h +++ b/xen/include/asm-x86/fixmap.h @@ -66,6 +66,7 @@ enum fixed_addresses { FIX_APEI_RANGE_BASE, FIX_APEI_RANGE_END = FIX_APEI_RANGE_BASE + FIX_APEI_RANGE_MAX -1, FIX_IGD_MMIO, + FIX_EFI_MPF, __end_of_fixed_addresses }; -- 1.7.2.5 _______________________________________________ kexec mailing list kexec@lists.infradead.org http://lists.infradead.org/mailman/listinfo/kexec