Looks good. Reviewed-by: Don Slutz <dslutz at verizon.com> -Don Slutz On 11/06/13 09:49, David Vrabel wrote: > From: David Vrabel <david.vrabel at citrix.com> > > 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 <david.vrabel at citrix.com> > Reviewed-by: Daniel Kiper <daniel.kiper at oracle.com> > Tested-by: Daniel Kiper <daniel.kiper at oracle.com> > Reviewed-by: Andrew Cooper <andrew.cooper3 at citrix.com> > --- > 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 > }; >