UefiCpuPkg/LocalApic.h: Remove duplicated/conflicted definitions

[mirror_edk2.git] / UefiCpuPkg / CpuMpPei / CpuMpPei.h

diff --git a/UefiCpuPkg/CpuMpPei/CpuMpPei.h b/UefiCpuPkg/CpuMpPei/CpuMpPei.h
index ef214503656a38ba6bc7aabf127192d08db41ac0..0d1a14a5f48a74b682199cef1010f60b50615004 100644 (file)
--- a/UefiCpuPkg/CpuMpPei/CpuMpPei.h
+++ b/UefiCpuPkg/CpuMpPei/CpuMpPei.h
@@ -25,6 +25,7 @@
 \r
 #include <Register/Cpuid.h>\r
 #include <Register/LocalApic.h>\r
+#include <Register/Msr.h>\r
 \r
 #include <Library/BaseLib.h>\r
 #include <Library/BaseMemoryLib.h>\r
@@ -66,8 +67,7 @@ typedef enum {
 //\r
 typedef struct {\r
   UINT8             *RendezvousFunnelAddress;\r
-  UINTN             PModeEntryOffset;\r
-  UINTN             LModeEntryOffset;\r
+  UINTN             ModeEntryOffset;\r
   UINTN             RendezvousFunnelSize;\r
 } MP_ASSEMBLY_ADDRESS_MAP;\r
 \r
@@ -98,11 +98,10 @@ typedef struct {
   IA32_DESCRIPTOR       GdtrProfile;\r
   IA32_DESCRIPTOR       IdtrProfile;\r
   UINTN                 BufferStart;\r
-  UINTN                 PmodeOffset;\r
+  UINTN                 ModeOffset;\r
   UINTN                 NumApsExecuting;\r
   UINTN                 CodeSegment;\r
   UINTN                 DataSegment;\r
-  UINTN                 LmodeOffset;\r
   UINTN                 Cr3;\r
   PEI_CPU_MP_DATA       *PeiCpuMpData;\r
 } MP_CPU_EXCHANGE_INFO;\r