diff options
| author | Michael Shalayeff <mickey@cvs.openbsd.org> | 2005-06-01 16:41:04 +0000 |
|---|---|---|
| committer | Michael Shalayeff <mickey@cvs.openbsd.org> | 2005-06-01 16:41:04 +0000 |
| commit | 3ca8fff023fe16c7f6f77d80922764c370a4b9dc (patch) | |
| tree | 30de778f7651ca26a212b615fb6669a05627c30f /sys/arch/i386 | |
| parent | 6430699b834ca067c46ddf2ba902e1e57a2a87ed (diff) | |
kjell is an evil tree-breaker
Diffstat (limited to 'sys/arch/i386')
| -rw-r--r-- | sys/arch/i386/i386/machdep.c | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/sys/arch/i386/i386/machdep.c b/sys/arch/i386/i386/machdep.c index 8da55c9d703..72cb8067182 100644 --- a/sys/arch/i386/i386/machdep.c +++ b/sys/arch/i386/i386/machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: machdep.c,v 1.319 2005/05/28 09:48:54 kjell Exp $ */ +/* $OpenBSD: machdep.c,v 1.320 2005/06/01 16:41:03 mickey Exp $ */ /* $NetBSD: machdep.c,v 1.214 1996/11/10 03:16:17 thorpej Exp $ */ /*- @@ -1146,10 +1146,8 @@ void cyrix3_cpu_setup(struct cpu_info *ci) { #if defined(I686_CPU) - int model, step; - - model = (ci->ci_signature >> 4) & 15; - step = ci->ci_signature & 15; + int model = (ci->ci_signature >> 4) & 15; + int step = ci->ci_signature & 15; u_int64_t msreg; u_int32_t regs[4]; @@ -1414,12 +1412,6 @@ void intel686_common_cpu_setup(struct cpu_info *ci) { - /* - * Make sure SYSENTER is disabled. - */ - if (cpu_feature & CPUID_SEP) - wrmsr(MSR_SYSENTER_CS, 0); - #if !defined(SMALL_KERNEL) && defined(I686_CPU) int model = (ci->ci_signature >> 4) & 15; int step = ci->ci_signature & 15; @@ -1445,6 +1437,11 @@ intel686_common_cpu_setup(struct cpu_info *ci) pagezero = i686_pagezero; } #endif + /* + * Make sure SYSENTER is disabled. + */ + if (cpu_feature & CPUID_SEP) + wrmsr(MSR_SYSENTER_CS, 0); } void |