From cc6c8e90e246f9083e3cc1f1407f2a22af9a8dbc Mon Sep 17 00:00:00 2001 From: Aleksey Bragin Date: Tue, 22 Mar 2011 16:35:51 +0000 Subject: [PATCH] [NTOS/KE] - Remove VirtualBox SYSENTER-hack added in r50991. - Bring back NT-compatible SYSENTER support detection changed in r50991. svn path=/trunk/; revision=51120 --- reactos/ntoskrnl/ke/i386/cpu.c | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/reactos/ntoskrnl/ke/i386/cpu.c b/reactos/ntoskrnl/ke/i386/cpu.c index 38539b11e70..693701b13af 100644 --- a/reactos/ntoskrnl/ke/i386/cpu.c +++ b/reactos/ntoskrnl/ke/i386/cpu.c @@ -303,17 +303,10 @@ KiGetFeatureBits(VOID) /* Remove support for correct PTE support. */ FeatureBits &= ~KF_WORKING_PTE; } - - /* Virtualbox claims to have no SYSENTER support, - * which is false for processors >= Pentium Pro */ - if(Prcb->CpuType >= 6) - { - Reg[3] |= 0x800; - } - /* Check if the CPU is too old to support SYSENTER, - * See Intel CPUID instruction manual for details*/ - if ((Reg[0] & 0x0FFF3FFF) < 0x00000633) + /* Check if the CPU is too old to support SYSENTER */ + if ((Prcb->CpuType < 6) || + ((Prcb->CpuType == 6) && (Prcb->CpuStep < 0x0303))) { /* Disable it */ Reg[3] &= ~0x800;