diff --git a/UefiCpuPkg/Library/MpInitLib/MpLib.c b/UefiCpuPkg/Library/MpInitLib/MpLib.c
index 49be5d5385..d32adf0780 100644
--- a/UefiCpuPkg/Library/MpInitLib/MpLib.c
+++ b/UefiCpuPkg/Library/MpInitLib/MpLib.c
@@ -475,7 +475,7 @@ CollectProcessorCount (
     CpuPause ();
   }
 
-  
+
   //
   // Enable x2APIC mode if
   //  1. Number of CPU is greater than 255; or
diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/PageTbl.c b/UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/PageTbl.c
index f891a81112..2483f2ea84 100644
--- a/UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/PageTbl.c
+++ b/UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/PageTbl.c
@@ -342,7 +342,7 @@ RestoreCr2 (
 
   @retval TRUE  Access to non-SMRAM is restricted.
   @retval FALSE Access to non-SMRAM is not restricted.
-*/
+**/
 BOOLEAN
 IsRestrictedMemoryAccess (
   VOID
diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.h b/UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.h
index daf977f654..7e7c73f27f 100644
--- a/UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.h
+++ b/UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.h
@@ -1455,7 +1455,7 @@ InitializeDataForMmMp (
 
   @retval TRUE  Access to non-SMRAM is restricted.
   @retval FALSE Access to non-SMRAM is not restricted.
-*/
+**/
 BOOLEAN
 IsRestrictedMemoryAccess (
   VOID
diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/X64/PageTbl.c b/UefiCpuPkg/PiSmmCpuDxeSmm/X64/PageTbl.c
index e5c4788c13..810985df20 100644
--- a/UefiCpuPkg/PiSmmCpuDxeSmm/X64/PageTbl.c
+++ b/UefiCpuPkg/PiSmmCpuDxeSmm/X64/PageTbl.c
@@ -1275,7 +1275,7 @@ RestoreCr2 (
 
   @retval TRUE  Access to non-SMRAM is restricted.
   @retval FALSE Access to non-SMRAM is not restricted.
-*/
+**/
 BOOLEAN
 IsRestrictedMemoryAccess (
   VOID