Date: Tue, 10 Nov 2009 17:35:20 +0000 (UTC) From: Ed Schouten <ed@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r199144 - user/ed/newcons/sys/amd64/amd64 Message-ID: <200911101735.nAAHZKUY066695@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ed Date: Tue Nov 10 17:35:19 2009 New Revision: 199144 URL: http://svn.freebsd.org/changeset/base/199144 Log: Revert this recent change in my branch. Prevents my systems from booting. Modified: user/ed/newcons/sys/amd64/amd64/initcpu.c Modified: user/ed/newcons/sys/amd64/amd64/initcpu.c ============================================================================== --- user/ed/newcons/sys/amd64/amd64/initcpu.c Tue Nov 10 16:51:15 2009 (r199143) +++ user/ed/newcons/sys/amd64/amd64/initcpu.c Tue Nov 10 17:35:19 2009 (r199144) @@ -47,13 +47,6 @@ __FBSDID("$FreeBSD$"); static int hw_instruction_sse; SYSCTL_INT(_hw, OID_AUTO, instruction_sse, CTLFLAG_RD, &hw_instruction_sse, 0, "SIMD/MMX2 instructions available in CPU"); -/* - * -1: automatic (default) - * 0: keep enable CLFLUSH - * 1: force disable CLFLUSH - */ -static int hw_clflush_disable = -1; -TUNABLE_INT("hw.clflush_disable", &hw_clflush_disable); int cpu; /* Are we 386, 386sx, 486, etc? */ u_int cpu_feature; /* Feature flags */ @@ -176,16 +169,6 @@ initializecpu(void) * XXXKIB: (temporary) hack to work around traps generated when * CLFLUSHing APIC registers window. */ - TUNABLE_INT_FETCH("hw.clflush_disable", &hw_clflush_disable); - if (cpu_vendor_id == CPU_VENDOR_INTEL && !(cpu_feature & CPUID_SS) && - hw_clflush_disable == -1) - cpu_feature &= ~CPUID_CLFSH; - /* - * Allow to disable CLFLUSH feature manually by - * hw.clflush_disable tunable. This may help Xen guest on some AMD - * CPUs. - */ - if (hw_clflush_disable == 1) { + if (cpu_vendor_id == CPU_VENDOR_INTEL && !(cpu_feature & CPUID_SS)) cpu_feature &= ~CPUID_CLFSH; - } }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200911101735.nAAHZKUY066695>