]> git.proxmox.com Git - mirror_edk2.git/commitdiff
UefiCpuPkg/PiSmmCpuDxeSmm: move InitSmmS3Cr3() into else block
authorJian J Wang <jian.j.wang@intel.com>
Fri, 14 Sep 2018 05:40:37 +0000 (13:40 +0800)
committerJian J Wang <jian.j.wang@intel.com>
Mon, 17 Sep 2018 02:45:53 +0000 (10:45 +0800)
BZ#: https://bugzilla.tianocore.org/show_bug.cgi?id=1165

InitSmmS3Cr3 () will update SmmS3ResumeState so moving the calling of
it into else block to keep the logic consistency.

Cc: Star Zeng <star.zeng@intel.com>
Cc: Benjamin You <benjamin.you@intel.com>
Cc: Eric Dong <eric.dong@intel.com>
Cc: Laszlo Ersek <lersek@redhat.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Jian J Wang <jian.j.wang@intel.com>
Reviewed-by: Eric Dong <eric.dong@intel.com>
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
UefiCpuPkg/PiSmmCpuDxeSmm/CpuS3.c

index fcbd56240d27bd851ef6a402bd2f518bfb76b371..52ff9679d565df54e78807055577422dfa3f2aac 100644 (file)
@@ -752,12 +752,12 @@ InitSmmS3ResumeState (
     if (sizeof (UINTN) == sizeof (UINT32)) {\r
       SmmS3ResumeState->Signature = SMM_S3_RESUME_SMM_32;\r
     }\r
-  }\r
 \r
-  //\r
-  // Patch SmmS3ResumeState->SmmS3Cr3\r
-  //\r
-  InitSmmS3Cr3 ();\r
+    //\r
+    // Patch SmmS3ResumeState->SmmS3Cr3\r
+    //\r
+    InitSmmS3Cr3 ();\r
+  }\r
 \r
   //\r
   // Allocate safe memory in ACPI NVS for AP to execute hlt loop in\r