Multi-processor PPI header file 'Ppi/Mpservices.h' uses a function prototype EFI_AP_PROCEDURE which is defined in 'Pi/PiDxeCis.h' (DXE header file).
This will cause a build fail when 'Ppi/Mpservices.h' is included in a PEI module. Since both phase support multi-processor service now, function prototype EFI_AP_PROCEDURE should be moved to 'Pi/PiMultiPhase.h'. The move is a compatible change and will not affect other codes. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Hao Wu <hao.a...@intel.com> Reviewed-by: Jeff Fan <jeff....@intel.com> Reviewed-by: Liming Gao <liming....@intel.com> --- MdePkg/Include/Pi/PiDxeCis.h | 15 --------------- MdePkg/Include/Pi/PiMultiPhase.h | 16 +++++++++++++++- 2 files changed, 15 insertions(+), 16 deletions(-) diff --git a/MdePkg/Include/Pi/PiDxeCis.h b/MdePkg/Include/Pi/PiDxeCis.h index a2208df..3292809 100644 --- a/MdePkg/Include/Pi/PiDxeCis.h +++ b/MdePkg/Include/Pi/PiDxeCis.h @@ -737,19 +737,4 @@ typedef struct { typedef DXE_SERVICES EFI_DXE_SERVICES; - -/** - The function prototype for invoking a function on an Application Processor. - - This definition is used by the UEFI MP Serices Protocol, and the - PI SMM System Table. - - @param[in,out] Buffer The pointer to private data buffer. -**/ -typedef -VOID -(EFIAPI *EFI_AP_PROCEDURE)( - IN OUT VOID *Buffer - ); - #endif diff --git a/MdePkg/Include/Pi/PiMultiPhase.h b/MdePkg/Include/Pi/PiMultiPhase.h index 2aa4c27..169258c 100644 --- a/MdePkg/Include/Pi/PiMultiPhase.h +++ b/MdePkg/Include/Pi/PiMultiPhase.h @@ -1,7 +1,7 @@ /** @file Include file matches things in PI for multiple module types. -Copyright (c) 2006 - 2013, Intel Corporation. All rights reserved.<BR> +Copyright (c) 2006 - 2015, Intel Corporation. All rights reserved.<BR> This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License that accompanies this distribution. The full text of the license may be found at @@ -162,4 +162,18 @@ typedef struct { CHAR8 *PcdName; } EFI_PCD_INFO; +/** + The function prototype for invoking a function on an Application Processor. + + This definition is used by the UEFI MP Serices Protocol, and the + PI SMM System Table. + + @param[in,out] Buffer The pointer to private data buffer. +**/ +typedef +VOID +(EFIAPI *EFI_AP_PROCEDURE)( + IN OUT VOID *Buffer + ); + #endif -- 1.9.5.msysgit.0 ------------------------------------------------------------------------------ One dashboard for servers and applications across Physical-Virtual-Cloud Widest out-of-the-box monitoring support with 50+ applications Performance metrics, stats and reports that give you Actionable Insights Deep dive visibility with transaction tracing using APM Insight. http://ad.doubleclick.net/ddm/clk/290420510;117567292;y _______________________________________________ edk2-devel mailing list edk2-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/edk2-devel