OvmfPkg: Fix VS2015 warning C4459 in XenBusDxe

[mirror_edk2.git] / UefiCpuPkg / CpuDxe / CpuMp.h

diff --git a/UefiCpuPkg/CpuDxe/CpuMp.h b/UefiCpuPkg/CpuDxe/CpuMp.h
index 4254419a933c3ed3af749e5dac5a0cb998b6d665..503f3ae944fe850e1a2afeeb15aa6604ef2e0242 100644 (file)
--- a/UefiCpuPkg/CpuDxe/CpuMp.h
+++ b/UefiCpuPkg/CpuDxe/CpuMp.h
@@ -1,7 +1,7 @@
 /** @file\r
   CPU DXE MP support\r
 \r
-  Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>\r
+  Copyright (c) 2006 - 2015, Intel Corporation. All rights reserved.<BR>\r
   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
   which accompanies this distribution.  The full text of the license may be found at\r
@@ -15,8 +15,12 @@
 #ifndef _CPU_MP_H_\r
 #define _CPU_MP_H_\r
 \r
+#include <Ppi/SecPlatformInformation.h>\r
+#include <Ppi/SecPlatformInformation2.h>\r
 #include <Protocol/MpService.h>\r
 #include <Library/SynchronizationLib.h>\r
+#include <Library/HobLib.h>\r
+#include <Library/ReportStatusCodeLib.h>\r
 \r
 /**\r
   Initialize Multi-processor support.\r
@@ -79,8 +83,9 @@ typedef enum {
   CpuStateIdle,\r
   CpuStateBlocked,\r
   CpuStateReady,\r
-  CpuStateBuzy,\r
-  CpuStateFinished\r
+  CpuStateBusy,\r
+  CpuStateFinished,\r
+  CpuStateSleeping\r
 } CPU_STATE;\r
 \r
 /**\r
@@ -90,10 +95,11 @@ typedef enum {
 typedef struct {\r
   EFI_PROCESSOR_INFORMATION      Info;\r
   SPIN_LOCK                      CpuDataLock;\r
+  INTN                           LockSelf;\r
   volatile CPU_STATE             State;\r
 \r
-  EFI_AP_PROCEDURE               Procedure;\r
-  VOID                           *Parameter;\r
+  volatile EFI_AP_PROCEDURE      Procedure;\r
+  volatile VOID*                 Parameter;\r
   BOOLEAN                        *Finished;\r
   INTN                           Timeout;\r
   EFI_EVENT                      WaitEvent;\r
@@ -637,5 +643,18 @@ ResetApStackless (
   IN UINT32 ProcessorId\r
   );\r
 \r
+/**\r
+  A minimal wrapper function that allows MtrrSetAllMtrrs() to be passed to\r
+  EFI_MP_SERVICES_PROTOCOL.StartupAllAPs() as Procedure.\r
+\r
+  @param[in] Buffer  Pointer to an MTRR_SETTINGS object, to be passed to\r
+                     MtrrSetAllMtrrs().\r
+**/\r
+VOID\r
+EFIAPI\r
+SetMtrrsFromBuffer (\r
+  IN VOID *Buffer\r
+  );\r
+\r
 #endif // _CPU_MP_H_\r
 \r