2 files changed, 4 insertions, 4 deletions
diff --git a/EdkCompatibilityPkg/Compatibility/SmmBaseHelper/X64/PageFaultHandler.S b/EdkCompatibilityPkg/Compatibility/SmmBaseHelper/X64/PageFaultHandler.S
index bcf2bd6118..5a50507353 100644
--- a/EdkCompatibilityPkg/Compatibility/SmmBaseHelper/X64/PageFaultHandler.S
+++ b/EdkCompatibilityPkg/Compatibility/SmmBaseHelper/X64/PageFaultHandler.S
@@ -40,7 +40,7 @@ ASM_PFX(PageFaultHandlerHook):
     popq     %rcx
     popq     %rax                         # restore all volatile registers
     jnz      L1
-    jmp      ASM_PFX(mOriginalHandler)
+    jmpq     *ASM_PFX(mOriginalHandler)
 L1:
     addq     $0x08, %rsp                  # skip error code for PF
     iretq
diff --git a/EdkCompatibilityPkg/Compatibility/SmmBaseHelper/X64/PageFaultHandler.asm b/EdkCompatibilityPkg/Compatibility/SmmBaseHelper/X64/PageFaultHandler.asm
index 2c695e3b88..2bc6abdd2e 100644
--- a/EdkCompatibilityPkg/Compatibility/SmmBaseHelper/X64/PageFaultHandler.asm
+++ b/EdkCompatibilityPkg/Compatibility/SmmBaseHelper/X64/PageFaultHandler.asm
@@ -19,8 +19,8 @@
 ;
 ;------------------------------------------------------------------------------
 
-mOriginalHandler PROTO
-PageFaultHandler PROTO
+EXTERN mOriginalHandler:QWORD
+EXTERN PageFaultHandler:PROC
 
   .code
 
@@ -49,4 +49,4 @@ PageFaultHandlerHook PROC
     add     rsp, 08h                    ; skip error code for PF
     iretq
 PageFaultHandlerHook ENDP
-  END
-\ No newline at end of file
+  END