d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename cpuid_cpuinfo to cpu_procinfo. bde requested that I rename this

Browse Source 
variable to something in the cpu_* namespace since that's what all the
other cpuid variables were named and cpu_procinfo is what I came up with.

Requested by:	bde
This commit is contained in:
John Baldwin 2003-01-22 17:54:12 +00:00
parent 07350d12cf
commit caf3197636
15 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/amd64/amd64/identcpu.c
View File

@ -294,7 +294,7 @@ printcpuinfo(void)
* CPUID, try to look it up in the brand table.
*/
if (cpu_high > 0 && *cpu_brand == '\0') {
brand_index = cpuid_cpuinfo & CPUID_BRAND_INDEX;
brand_index = cpu_procinfo & CPUID_BRAND_INDEX;
if (brand_index <= MAX_BRAND_INDEX &&
cpu_brandtable[brand_index] != NULL)
strcpy(cpu_brand,
@ -649,9 +649,9 @@ printcpuinfo(void)
* the number of logical CPU's it contains.
*/
if (cpu_feature & CPUID_HTT &&
(cpuid_cpuinfo & CPUID_HTT_CORES) >> 16 > 1)
(cpu_procinfo & CPUID_HTT_CORES) >> 16 > 1)
printf("\n Hyperthreading: %d logical CPUs",
(cpuid_cpuinfo & CPUID_HTT_CORES) >> 16);
(cpu_procinfo & CPUID_HTT_CORES) >> 16);
}
if (strcmp(cpu_vendor, "AuthenticAMD") == 0 &&
cpu_exthigh >= 0x80000001)

2
sys/amd64/amd64/initcpu.c
View File

@ -82,7 +82,7 @@ int cpu = 0; /* Are we 386, 386sx, 486, etc? */
u_int cpu_id = 0; /* Stepping ID */
u_int cpu_feature = 0; /* Feature flags */
u_int cpu_high = 0; /* Highest arg to CPUID */
u_int cpuid_cpuinfo = 0; /* HyperThreading Info / Brand Index / CLFUSH */
u_int cpu_procinfo = 0; /* HyperThreading Info / Brand Index / CLFUSH */
#ifdef CPU_ENABLE_SSE
u_int cpu_fxsr = 0; /* SSE enabled */
#endif

2
sys/amd64/amd64/locore.S
View File

@ -720,7 +720,7 @@ trycpuid: /* Use the `cpuid' instruction. */
movl $1,%eax
cpuid # cpuid 1
movl %eax,R(cpu_id) # store cpu_id
movl %ebx,R(cpuid_cpuinfo) # store cpuid_cpuinfo
movl %ebx,R(cpu_procinfo) # store cpu_procinfo
movl %edx,R(cpu_feature) # store cpu_feature
rorl $8,%eax # extract family type
andl $15,%eax

2
sys/amd64/amd64/locore.s
View File

@ -720,7 +720,7 @@ trycpuid: /* Use the `cpuid' instruction. */
movl $1,%eax
cpuid # cpuid 1
movl %eax,R(cpu_id) # store cpu_id
movl %ebx,R(cpuid_cpuinfo) # store cpuid_cpuinfo
movl %ebx,R(cpu_procinfo) # store cpu_procinfo
movl %edx,R(cpu_feature) # store cpu_feature
rorl $8,%eax # extract family type
andl $15,%eax

2
sys/amd64/amd64/mp_machdep.c
View File

@ -1059,7 +1059,7 @@ mptable_hyperthread_fixup(u_int id_mask)
/* Nothing to do if there is no HTT support. */
if ((cpu_feature & CPUID_HTT) == 0)
return;
logical_cpus = (cpuid_cpuinfo & CPUID_HTT_CORES) >> 16;
logical_cpus = (cpu_procinfo & CPUID_HTT_CORES) >> 16;
if (logical_cpus <= 1)
return;

2
sys/amd64/amd64/mptable.c
View File

@ -1059,7 +1059,7 @@ mptable_hyperthread_fixup(u_int id_mask)
/* Nothing to do if there is no HTT support. */
if ((cpu_feature & CPUID_HTT) == 0)
return;
logical_cpus = (cpuid_cpuinfo & CPUID_HTT_CORES) >> 16;
logical_cpus = (cpu_procinfo & CPUID_HTT_CORES) >> 16;
if (logical_cpus <= 1)
return;

2
sys/amd64/include/md_var.h
View File

@ -45,7 +45,7 @@ extern int (*copyout_vector)(const void *kaddr, void *udaddr, size_t len);
extern u_int cpu_exthigh;
extern u_int cpu_feature;
extern u_int cpu_high;
extern u_int cpuid_cpuinfo;
extern u_int cpu_procinfo;
extern u_int cpu_id;
extern u_int cpu_fxsr;
extern char cpu_vendor[];

2
sys/amd64/include/mptable.h
View File

@ -1059,7 +1059,7 @@ mptable_hyperthread_fixup(u_int id_mask)
/* Nothing to do if there is no HTT support. */
if ((cpu_feature & CPUID_HTT) == 0)
return;
logical_cpus = (cpuid_cpuinfo & CPUID_HTT_CORES) >> 16;
logical_cpus = (cpu_procinfo & CPUID_HTT_CORES) >> 16;
if (logical_cpus <= 1)
return;

6
sys/i386/i386/identcpu.c
View File

@ -294,7 +294,7 @@ printcpuinfo(void)
* CPUID, try to look it up in the brand table.
*/
if (cpu_high > 0 && *cpu_brand == '\0') {
brand_index = cpuid_cpuinfo & CPUID_BRAND_INDEX;
brand_index = cpu_procinfo & CPUID_BRAND_INDEX;
if (brand_index <= MAX_BRAND_INDEX &&
cpu_brandtable[brand_index] != NULL)
strcpy(cpu_brand,
@ -649,9 +649,9 @@ printcpuinfo(void)
* the number of logical CPU's it contains.
*/
if (cpu_feature & CPUID_HTT &&
(cpuid_cpuinfo & CPUID_HTT_CORES) >> 16 > 1)
(cpu_procinfo & CPUID_HTT_CORES) >> 16 > 1)
printf("\n Hyperthreading: %d logical CPUs",
(cpuid_cpuinfo & CPUID_HTT_CORES) >> 16);
(cpu_procinfo & CPUID_HTT_CORES) >> 16);
}
if (strcmp(cpu_vendor, "AuthenticAMD") == 0 &&
cpu_exthigh >= 0x80000001)

2
sys/i386/i386/initcpu.c
View File

@ -82,7 +82,7 @@ int cpu = 0; /* Are we 386, 386sx, 486, etc? */
u_int cpu_id = 0; /* Stepping ID */
u_int cpu_feature = 0; /* Feature flags */
u_int cpu_high = 0; /* Highest arg to CPUID */
u_int cpuid_cpuinfo = 0; /* HyperThreading Info / Brand Index / CLFUSH */
u_int cpu_procinfo = 0; /* HyperThreading Info / Brand Index / CLFUSH */
#ifdef CPU_ENABLE_SSE
u_int cpu_fxsr = 0; /* SSE enabled */
#endif

2
sys/i386/i386/locore.s
View File

@ -720,7 +720,7 @@ trycpuid: /* Use the `cpuid' instruction. */
movl $1,%eax
cpuid # cpuid 1
movl %eax,R(cpu_id) # store cpu_id
movl %ebx,R(cpuid_cpuinfo) # store cpuid_cpuinfo
movl %ebx,R(cpu_procinfo) # store cpu_procinfo
movl %edx,R(cpu_feature) # store cpu_feature
rorl $8,%eax # extract family type
andl $15,%eax

2
sys/i386/i386/mp_machdep.c
View File

@ -1059,7 +1059,7 @@ mptable_hyperthread_fixup(u_int id_mask)
/* Nothing to do if there is no HTT support. */
if ((cpu_feature & CPUID_HTT) == 0)
return;
logical_cpus = (cpuid_cpuinfo & CPUID_HTT_CORES) >> 16;
logical_cpus = (cpu_procinfo & CPUID_HTT_CORES) >> 16;
if (logical_cpus <= 1)
return;

2
sys/i386/i386/mptable.c
View File

@ -1059,7 +1059,7 @@ mptable_hyperthread_fixup(u_int id_mask)
/* Nothing to do if there is no HTT support. */
if ((cpu_feature & CPUID_HTT) == 0)
return;
logical_cpus = (cpuid_cpuinfo & CPUID_HTT_CORES) >> 16;
logical_cpus = (cpu_procinfo & CPUID_HTT_CORES) >> 16;
if (logical_cpus <= 1)
return;

2
sys/i386/include/md_var.h
View File

@ -45,7 +45,7 @@ extern int (*copyout_vector)(const void *kaddr, void *udaddr, size_t len);
extern u_int cpu_exthigh;
extern u_int cpu_feature;
extern u_int cpu_high;
extern u_int cpuid_cpuinfo;
extern u_int cpu_procinfo;
extern u_int cpu_id;
extern u_int cpu_fxsr;
extern char cpu_vendor[];

2
sys/i386/include/mptable.h
View File

@ -1059,7 +1059,7 @@ mptable_hyperthread_fixup(u_int id_mask)
/* Nothing to do if there is no HTT support. */
if ((cpu_feature & CPUID_HTT) == 0)
return;
logical_cpus = (cpuid_cpuinfo & CPUID_HTT_CORES) >> 16;
logical_cpus = (cpu_procinfo & CPUID_HTT_CORES) >> 16;
if (logical_cpus <= 1)
return;