From owner-svn-src-user@FreeBSD.ORG  Tue Nov 10 17:35:20 2009
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 8CBD1106566C;
	Tue, 10 Nov 2009 17:35:20 +0000 (UTC) (envelope-from ed@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 7AC118FC1C;
	Tue, 10 Nov 2009 17:35:20 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id nAAHZKi3066697;
	Tue, 10 Nov 2009 17:35:20 GMT (envelope-from ed@svn.freebsd.org)
Received: (from ed@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id nAAHZKUY066695;
	Tue, 10 Nov 2009 17:35:20 GMT (envelope-from ed@svn.freebsd.org)
Message-Id: <200911101735.nAAHZKUY066695@svn.freebsd.org>
From: Ed Schouten <ed@FreeBSD.org>
Date: Tue, 10 Nov 2009 17:35:20 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r199144 - user/ed/newcons/sys/amd64/amd64
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 10 Nov 2009 17:35:20 -0000

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;
-	}
 }