Index: /trunk/src/VBox/VMM/VMMR0/HMSVMR0.cpp
===================================================================
--- /trunk/src/VBox/VMM/VMMR0/HMSVMR0.cpp	(revision 73150)
+++ /trunk/src/VBox/VMM/VMMR0/HMSVMR0.cpp	(revision 73151)
@@ -841,5 +841,4 @@
 DECLINLINE(bool) hmR0SvmSupportsNextRipSave(PVMCPU pVCpu)
 {
-#if 0
     PVM pVM = pVCpu->CTX_SUFF(pVM);
 #ifdef VBOX_WITH_NESTED_HWVIRT_SVM
@@ -851,9 +850,4 @@
 #endif
     return RT_BOOL(pVM->hm.s.svm.u32Features & X86_CPUID_SVM_FEATURE_EDX_NRIP_SAVE);
-#endif
-
-    /** @todo Temporarily disabled NRIP_SAVE for testing. re-enable once its working. */
-    NOREF(pVCpu);
-    return false;
 }
 
@@ -7900,4 +7894,5 @@
     if (fSupportsNextRipSave)
     {
+        HMSVM_CPUMCTX_IMPORT_STATE(pVCpu, IEM_CPUMCTX_EXTRN_EXEC_DECODED_NO_MEM_MASK | fImport);
         uint8_t const cbInstr = pVmcb->ctrl.u64NextRIP - pVCpu->cpum.GstCtx.rip;
         rcStrict = IEMExecDecodedStgi(pVCpu, cbInstr);