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");
>                       }
>  
>                       /*
> 
_______________________________________________
[email protected] mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "[EMAIL PROTECTED]"

Reply via email to