UefiCpuPkg: Clean up source files

[mirror_edk2.git] / UefiCpuPkg / Library / MpInitLib / X64 / MpFuncs.nasm

diff --git a/UefiCpuPkg/Library/MpInitLib/X64/MpFuncs.nasm b/UefiCpuPkg/Library/MpInitLib/X64/MpFuncs.nasm
index 75959888849e4666926d9ff7063ffe3de6cc13d6..31a25c2737fe60dc9042d78a265598c641dd711a 100644 (file)
--- a/UefiCpuPkg/Library/MpInitLib/X64/MpFuncs.nasm
+++ b/UefiCpuPkg/Library/MpInitLib/X64/MpFuncs.nasm
@@ -1,5 +1,5 @@
 ;------------------------------------------------------------------------------ ;\r
-; Copyright (c) 2015 - 2017, Intel Corporation. All rights reserved.<BR>\r
+; Copyright (c) 2015 - 2018, 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
@@ -216,7 +216,7 @@ GetNextProcNumber:
     jz          ProgramStack\r
     add         edi, 20\r
     inc         ebx\r
-    jmp         GetNextProcNumber    \r
+    jmp         GetNextProcNumber\r
 \r
 ProgramStack:\r
     mov         rsp, qword [edi + 12]\r
@@ -253,6 +253,7 @@ RendezvousFunnelProcEnd:
 global ASM_PFX(AsmRelocateApLoop)\r
 ASM_PFX(AsmRelocateApLoop):\r
 AsmRelocateApLoopStart:\r
+    cli                          ; Disable interrupt before switching to 32-bit mode\r
     mov        rax, [rsp + 40]   ; CountTofinish\r
     lock dec   dword [rax]       ; (*CountTofinish)--\r
     mov        rsp, r9\r
@@ -288,6 +289,7 @@ PmEntry:
     jnz        HltLoop\r
     mov        ebx, edx           ; Save C-State to ebx\r
 MwaitLoop:\r
+    cli\r
     mov        eax, esp           ; Set Monitor Address\r
     xor        ecx, ecx           ; ecx = 0\r
     xor        edx, edx           ; edx = 0\r