From owner-svn-src-all@FreeBSD.ORG Wed Oct 22 21:44:49 2008 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 F0AB61065679 for ; Wed, 22 Oct 2008 21:44:49 +0000 (UTC) (envelope-from dougb@FreeBSD.org) Received: from mail2.fluidhosting.com (mx24.fluidhosting.com [204.14.89.7]) by mx1.freebsd.org (Postfix) with ESMTP id 96EE48FC28 for ; Wed, 22 Oct 2008 21:44:49 +0000 (UTC) (envelope-from dougb@FreeBSD.org) Received: (qmail 6034 invoked by uid 399); 22 Oct 2008 21:18:09 -0000 Received: from localhost (HELO lap.dougb.net) (dougb@dougbarton.us@127.0.0.1) by localhost with ESMTPAM; 22 Oct 2008 21:18:09 -0000 X-Originating-IP: 127.0.0.1 X-Sender: dougb@dougbarton.us Message-ID: <48FF988F.80000@FreeBSD.org> Date: Wed, 22 Oct 2008 14:18:07 -0700 From: Doug Barton Organization: http://www.FreeBSD.org/ User-Agent: Thunderbird 2.0.0.17 (X11/20081010) MIME-Version: 1.0 To: Jung-uk Kim References: <200810221730.m9MHUc0R034507@svn.freebsd.org> In-Reply-To: <200810221730.m9MHUc0R034507@svn.freebsd.org> X-Enigmail-Version: 0.95.7 OpenPGP: id=D5B2F0FB Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r184169 - 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: Wed, 22 Oct 2008 21:44:50 -0000 This change in the i386 directory causes the following error. After reverting this it compiles. Doug cc -c -O -pipe -std=c99 -g -Wall -Wredundant-decls -Wnested-externs -Wstrict-prototypes -Wmissing-prototypes -Wpointer-arith -Winline -Wcast-qual -Wundef -Wno-pointer-sign -fformat-extensions -nostdinc -I. -I/usr/local/src/sys -I/usr/local/src/sys/contrib/altq -D_KERNEL -DHAVE_KERNEL_OPTION_HEADERS -include opt_global.h -fno-common -finline-limit=8000 --param inline-unit-growth=100 --param large-function-growth=1000 -mno-align-long-strings -mpreferred-stack-boundary=2 -mno-mmx -mno-3dnow -mno-sse -mno-sse2 -mno-sse3 -ffreestanding -fstack-protector -Werror /usr/local/src/sys/i386/i386/identcpu.c cc1: warnings being treated as errors /usr/local/src/sys/i386/i386/identcpu.c: In function 'printcpuinfo': /usr/local/src/sys/i386/i386/identcpu.c:851: warning: implicit declaration of function 'AMD64_CPU_FAMILY' /usr/local/src/sys/i386/i386/identcpu.c:851: warning: nested extern declaration of 'AMD64_CPU_FAMILY' *** Error code 1 Jung-uk Kim wrote: > Author: jkim > Date: Wed Oct 22 17:30:37 2008 > New Revision: 184169 > URL: http://svn.freebsd.org/changeset/base/184169 > > Log: > Add AMD Family 0Fh, Model 6Bh, Stepping 2 to the list of invariant TSCs > and fix i386 test. > > Modified: > head/sys/amd64/amd64/identcpu.c > head/sys/i386/i386/identcpu.c > > Modified: head/sys/amd64/amd64/identcpu.c > ============================================================================== > --- head/sys/amd64/amd64/identcpu.c Wed Oct 22 16:50:12 2008 (r184168) > +++ head/sys/amd64/amd64/identcpu.c Wed Oct 22 17:30:37 2008 (r184169) > @@ -347,12 +347,17 @@ printcpuinfo(void) > "AuthenticAMD") == 0) > cpu_feature &= ~CPUID_HTT; > > + /* > + * If this CPU supports P-state invariant TSC then > + * mention the capability. > + */ > if (!tsc_is_invariant && > (strcmp(cpu_vendor, "AuthenticAMD") == 0 && > ((amd_pminfo & AMDPM_TSC_INVARIANT) != 0 || > - AMD64_CPU_FAMILY(cpu_id) >= 0x10))) { > + AMD64_CPU_FAMILY(cpu_id) >= 0x10 || > + cpu_id == 0x60fb2))) { > tsc_is_invariant = 1; > - printf("\n P-state invariant TSC"); > + printf("\n TSC: P-state invariant"); > } > > /* > > Modified: head/sys/i386/i386/identcpu.c > ============================================================================== > --- head/sys/i386/i386/identcpu.c Wed Oct 22 16:50:12 2008 (r184168) > +++ head/sys/i386/i386/identcpu.c Wed Oct 22 17:30:37 2008 (r184169) > @@ -841,12 +841,17 @@ printcpuinfo(void) > "AuthenticAMD") == 0) > cpu_feature &= ~CPUID_HTT; > > + /* > + * If this CPU supports P-state invariant TSC then > + * mention the capability. > + */ > if (!tsc_is_invariant && > - ((strcmp(cpu_vendor, "AuthenticAMD") == 0 && > - (amd_pminfo & AMDPM_TSC_INVARIANT) != 0) || > - I386_CPU_FAMILY(cpu_id) >= 0x10)) { > + (strcmp(cpu_vendor, "AuthenticAMD") == 0 && > + ((amd_pminfo & AMDPM_TSC_INVARIANT) != 0 || > + AMD64_CPU_FAMILY(cpu_id) >= 0x10 || > + cpu_id == 0x60fb2))) { > tsc_is_invariant = 1; > - printf("\n P-state invariant TSC"); > + printf("\n TSC: P-state invariant"); > } > > /* >