3 files changed, 15 insertions, 25 deletions
diff --git a/MdePkg/Include/Pi/PiDxeCis.h b/MdePkg/Include/Pi/PiDxeCis.h
index 9ed4da661a..75f1736410 100644
--- a/MdePkg/Include/Pi/PiDxeCis.h
+++ b/MdePkg/Include/Pi/PiDxeCis.h
@@ -695,4 +695,19 @@ typedef struct {
 
 typedef DXE_SERVICES EFI_DXE_SERVICES;
 
+
+/**
+  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  Pointer to private data buffer.
+**/
+typedef
+VOID
+(EFIAPI *EFI_AP_PROCEDURE)(
+  IN OUT VOID  *Buffer
+  );
+
 #endif
diff --git a/MdePkg/Include/Pi/PiSmmCis.h b/MdePkg/Include/Pi/PiSmmCis.h
index 77556be0fe..52eaea560d 100644
--- a/MdePkg/Include/Pi/PiSmmCis.h
+++ b/MdePkg/Include/Pi/PiSmmCis.h
@@ -68,17 +68,6 @@ EFI_STATUS
   );
 
 /**
-  Function prototype for invoking a function on an Application Processor.
-
-  @param[in,out] Buffer  Pointer to private data buffer.
-**/
-typedef
-VOID
-(EFIAPI *EFI_AP_PROCEDURE)(
-  IN OUT VOID  *Buffer
-  );
-
-/**
   The SmmStartupThisAp() lets the caller to get one distinct application processor
   (AP) in the enabled processor pool to execute a caller-provided code stream
   while in SMM. It runs the given code on this processor and reports the status.
diff --git a/MdePkg/Include/Protocol/MpService.h b/MdePkg/Include/Protocol/MpService.h
index c86b8b8e24..6dd9cf6599 100644
--- a/MdePkg/Include/Protocol/MpService.h
+++ b/MdePkg/Include/Protocol/MpService.h
@@ -141,20 +141,6 @@ typedef struct {
 } EFI_PROCESSOR_INFORMATION;
 
 /**
-  Functions of this type are passed into StartUpAllAPs() and StartThisAP() to
-  execute a procedure on enabled APs.  The context the AP should use durng 
-  execution is specified by ProcedureArgument.
-  
-  @param[in]  ProcedureArgument   Pointer to the procedure's argument.
-
-**/
-typedef
-VOID
-(EFIAPI *EFI_AP_PROCEDURE)(
-  IN  VOID  *ProcedureArgument
-  );
-
-/**
   This service retrieves the number of logical processor in the platform
   and the number of those logical processors that are enabled on this boot.
   This service may only be called from the BSP.