Index: /trunk/src/VBox/VMM/VMMR0/HWACCMR0Mixed.mac
===================================================================
--- /trunk/src/VBox/VMM/VMMR0/HWACCMR0Mixed.mac	(revision 42814)
+++ /trunk/src/VBox/VMM/VMMR0/HWACCMR0Mixed.mac	(revision 42815)
@@ -7,5 +7,5 @@
 
 ;
-; Copyright (C) 2006-2007 Oracle Corporation
+; Copyright (C) 2006-2012 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
@@ -407,7 +407,4 @@
     ; Save the host MSRs and load the guest MSRs
     LOADGUESTMSR MSR_K8_LSTAR, CPUMCTX.msrLSTAR
-%if 0  ; not supported on Intel CPUs
-    LOADGUESTMSR MSR_K8_CSTAR, CPUMCTX.msrCSTAR
-%endif
     LOADGUESTMSR MSR_K6_STAR, CPUMCTX.msrSTAR
     LOADGUESTMSR MSR_K8_SF_MASK, CPUMCTX.msrSFMASK
@@ -546,7 +543,4 @@
     LOADHOSTMSREX MSR_K8_SF_MASK, CPUMCTX.msrSFMASK
     LOADHOSTMSREX MSR_K6_STAR, CPUMCTX.msrSTAR
-%if 0  ; not supported on Intel CPUs
-    LOADHOSTMSREX MSR_K8_CSTAR, CPUMCTX.msrCSTAR
-%endif
     LOADHOSTMSREX MSR_K8_LSTAR, CPUMCTX.msrLSTAR
 %endif
@@ -619,7 +613,4 @@
     LOADHOSTMSR MSR_K8_SF_MASK
     LOADHOSTMSR MSR_K6_STAR
-%if 0  ; not supported on Intel CPUs
-    LOADHOSTMSR MSR_K8_CSTAR
-%endif
     LOADHOSTMSR MSR_K8_LSTAR
 %endif
@@ -668,7 +659,4 @@
     LOADHOSTMSR MSR_K8_SF_MASK
     LOADHOSTMSR MSR_K6_STAR
-%if 0  ; not supported on Intel CPUs
-    LOADHOSTMSR MSR_K8_CSTAR
-%endif
     LOADHOSTMSR MSR_K8_LSTAR
 %endif
Index: /trunk/src/VBox/VMM/VMMRC/HWACCMRCA.asm
===================================================================
--- /trunk/src/VBox/VMM/VMMRC/HWACCMRCA.asm	(revision 42814)
+++ /trunk/src/VBox/VMM/VMMRC/HWACCMRCA.asm	(revision 42815)
@@ -5,5 +5,5 @@
 
 ;
-; Copyright (C) 2006-2007 Oracle Corporation
+; Copyright (C) 2006-2012 Oracle Corporation
 ;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
@@ -232,7 +232,4 @@
     ;; @todo use the automatic load feature for MSRs
     LOADGUESTMSR MSR_K8_LSTAR,          CPUMCTX.msrLSTAR
-%if 0  ; not supported on Intel CPUs
-    LOADGUESTMSR MSR_K8_CSTAR,          CPUMCTX.msrCSTAR
-%endif
     LOADGUESTMSR MSR_K6_STAR,           CPUMCTX.msrSTAR
     LOADGUESTMSR MSR_K8_SF_MASK,        CPUMCTX.msrSFMASK
@@ -307,7 +304,4 @@
     ;; @todo use the automatic load feature for MSRs
     SAVEGUESTMSR MSR_K8_LSTAR,          CPUMCTX.msrLSTAR
-%if 0  ; not supported on Intel CPUs
-    SAVEGUESTMSR MSR_K8_CSTAR,          CPUMCTX.msrCSTAR
-%endif
     SAVEGUESTMSR MSR_K6_STAR,           CPUMCTX.msrSTAR
     SAVEGUESTMSR MSR_K8_SF_MASK,        CPUMCTX.msrSFMASK