From owner-svn-src-all@FreeBSD.ORG  Tue Nov 23 14:36:15 2010
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 182241065694;
	Tue, 23 Nov 2010 14:36:15 +0000 (UTC) (envelope-from avg@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 068048FC16;
	Tue, 23 Nov 2010 14:36:15 +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 oANEaER2033557;
	Tue, 23 Nov 2010 14:36:14 GMT (envelope-from avg@svn.freebsd.org)
Received: (from avg@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id oANEaEtb033555;
	Tue, 23 Nov 2010 14:36:14 GMT (envelope-from avg@svn.freebsd.org)
Message-Id: <201011231436.oANEaEtb033555@svn.freebsd.org>
From: Andriy Gapon <avg@FreeBSD.org>
Date: Tue, 23 Nov 2010 14:36:14 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r215751 - head/sys/x86/x86
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 23 Nov 2010 14:36:15 -0000

Author: avg
Date: Tue Nov 23 14:36:14 2010
New Revision: 215751
URL: http://svn.freebsd.org/changeset/base/215751

Log:
  x86/local_apic: use newly added ARAT bit definition
  
  ARAT: APIC-Timer-always-running feature.
  
  Suggested by:	mav
  MFC after:	12 days

Modified:
  head/sys/x86/x86/local_apic.c

Modified: head/sys/x86/x86/local_apic.c
==============================================================================
--- head/sys/x86/x86/local_apic.c	Tue Nov 23 14:30:22 2010	(r215750)
+++ head/sys/x86/x86/local_apic.c	Tue Nov 23 14:36:14 2010	(r215751)
@@ -251,7 +251,7 @@ lapic_init(vm_paddr_t addr)
 		/* Intel CPUID 0x06 EAX[2] set if APIC timer runs in C3. */
 		if (cpu_vendor_id == CPU_VENDOR_INTEL && cpu_high >= 6) {
 			do_cpuid(0x06, regs);
-			if (regs[0] & 0x4)
+			if ((regs[0] & CPUTPM1_ARAT) != 0)
 				arat = 1;
 		}
 		bzero(&lapic_et, sizeof(lapic_et));