UINTN Index2;\r
UINTN Index3;\r
UINT32 ApicId;\r
- EFI_HEALTH_FLAGS Health;\r
+ PEI_CPU_DATA CpuData;\r
UINT32 ApCount;\r
\r
ApCount = PeiCpuMpData->CpuCount - 1;\r
}\r
}\r
if (Index3 != Index1) {\r
- PeiCpuMpData->CpuData[Index3].ApicId = PeiCpuMpData->CpuData[Index1].ApicId;\r
- PeiCpuMpData->CpuData[Index1].ApicId = ApicId;\r
- Health = PeiCpuMpData->CpuData[Index3].Health;\r
- PeiCpuMpData->CpuData[Index3].Health = PeiCpuMpData->CpuData[Index1].Health;\r
- PeiCpuMpData->CpuData[Index1].Health = Health;\r
+ CopyMem (&CpuData, &PeiCpuMpData->CpuData[Index3], sizeof (PEI_CPU_DATA));\r
+ CopyMem (\r
+ &PeiCpuMpData->CpuData[Index3],\r
+ &PeiCpuMpData->CpuData[Index1],\r
+ sizeof (PEI_CPU_DATA)\r
+ );\r
+ CopyMem (&PeiCpuMpData->CpuData[Index1], &CpuData, sizeof (PEI_CPU_DATA));\r
}\r
}\r
\r