From owner-svn-src-all@FreeBSD.ORG Tue Dec 7 22:22:40 2010 Return-Path: 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 69E44106564A; Tue, 7 Dec 2010 22:22:40 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [65.122.17.42]) by mx1.freebsd.org (Postfix) with ESMTP id 3A8028FC08; Tue, 7 Dec 2010 22:22:40 +0000 (UTC) Received: from bigwig.baldwin.cx (66.111.2.69.static.nyinternet.net [66.111.2.69]) by cyrus.watson.org (Postfix) with ESMTPSA id D466746B45; Tue, 7 Dec 2010 17:22:39 -0500 (EST) Received: from jhbbsd.localnet (smtp.hudson-trading.com [209.249.190.9]) by bigwig.baldwin.cx (Postfix) with ESMTPSA id EA6518A009; Tue, 7 Dec 2010 17:22:38 -0500 (EST) From: John Baldwin To: "Jung-uk Kim" Date: Tue, 7 Dec 2010 17:22:29 -0500 User-Agent: KMail/1.13.5 (FreeBSD/7.3-CBSD-20101102; KDE/4.4.5; amd64; ; ) References: <201012072212.oB7MC2q7081560@svn.freebsd.org> In-Reply-To: <201012072212.oB7MC2q7081560@svn.freebsd.org> MIME-Version: 1.0 Content-Type: Text/Plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <201012071722.29481.jhb@freebsd.org> X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.2.6 (bigwig.baldwin.cx); Tue, 07 Dec 2010 17:22:39 -0500 (EST) X-Virus-Scanned: clamav-milter 0.96.3 at bigwig.baldwin.cx X-Virus-Status: Clean X-Spam-Status: No, score=-1.9 required=4.2 tests=BAYES_00 autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on bigwig.baldwin.cx Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r216272 - in head/sys: amd64/amd64 i386/i386 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 " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 07 Dec 2010 22:22:40 -0000 On Tuesday, December 07, 2010 5:12:02 pm Jung-uk Kim wrote: > Author: jkim > Date: Tue Dec 7 22:12:02 2010 > New Revision: 216272 > URL: http://svn.freebsd.org/changeset/base/216272 > > Log: > Probe P-state invariant TSC from rightful place. > > Modified: > head/sys/amd64/amd64/identcpu.c > head/sys/amd64/amd64/tsc.c > head/sys/i386/i386/identcpu.c > head/sys/i386/i386/tsc.c > > Modified: head/sys/amd64/amd64/identcpu.c > ============================================================================== > --- head/sys/amd64/amd64/identcpu.c Tue Dec 7 22:00:48 2010 (r216271) > +++ head/sys/amd64/amd64/identcpu.c Tue Dec 7 22:12:02 2010 (r216272) > @@ -392,28 +392,6 @@ printcpuinfo(void) > * If this CPU supports P-state invariant TSC then > * mention the capability. > */ > - switch (cpu_vendor_id) { > - case CPU_VENDOR_AMD: > - if ((amd_pminfo & AMDPM_TSC_INVARIANT) || > - CPUID_TO_FAMILY(cpu_id) >= 0x10 || > - cpu_id == 0x60fb2) > - tsc_is_invariant = 1; > - break; > - case CPU_VENDOR_INTEL: > - if ((amd_pminfo & AMDPM_TSC_INVARIANT) || > - (CPUID_TO_FAMILY(cpu_id) == 0x6 && > - CPUID_TO_MODEL(cpu_id) >= 0xe) || > - (CPUID_TO_FAMILY(cpu_id) == 0xf && > - CPUID_TO_MODEL(cpu_id) >= 0x3)) > - tsc_is_invariant = 1; > - break; > - case CPU_VENDOR_CENTAUR: > - if (CPUID_TO_FAMILY(cpu_id) == 0x6 && > - CPUID_TO_MODEL(cpu_id) >= 0xf && > - (rdmsr(0x1203) & 0x100000000ULL) == 0) > - tsc_is_invariant = 1; > - break; > - } > if (tsc_is_invariant) > printf("\n TSC: P-state invariant"); Doesn't that break this printf? -- John Baldwin