diff options
author | jhb <jhb@FreeBSD.org> | 2003-01-22 17:54:12 +0000 |
---|---|---|
committer | jhb <jhb@FreeBSD.org> | 2003-01-22 17:54:12 +0000 |
commit | 0e59d6fe5806bbfebf0aa5e60e652ac145f8d59c (patch) | |
tree | 93939431b4280dc791c9f9e96bebeaa42d0ea439 | |
parent | ae10e138a9733e0eb59f2b9459e8b68e6eb31521 (diff) | |
download | FreeBSD-src-0e59d6fe5806bbfebf0aa5e60e652ac145f8d59c.zip FreeBSD-src-0e59d6fe5806bbfebf0aa5e60e652ac145f8d59c.tar.gz |
Rename cpuid_cpuinfo to cpu_procinfo. bde requested that I rename this
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
-rw-r--r-- | sys/amd64/amd64/identcpu.c | 6 | ||||
-rw-r--r-- | sys/amd64/amd64/initcpu.c | 2 | ||||
-rw-r--r-- | sys/amd64/amd64/locore.S | 2 | ||||
-rw-r--r-- | sys/amd64/amd64/locore.s | 2 | ||||
-rw-r--r-- | sys/amd64/amd64/mp_machdep.c | 2 | ||||
-rw-r--r-- | sys/amd64/amd64/mptable.c | 2 | ||||
-rw-r--r-- | sys/amd64/include/md_var.h | 2 | ||||
-rw-r--r-- | sys/amd64/include/mptable.h | 2 | ||||
-rw-r--r-- | sys/i386/i386/identcpu.c | 6 | ||||
-rw-r--r-- | sys/i386/i386/initcpu.c | 2 | ||||
-rw-r--r-- | sys/i386/i386/locore.s | 2 | ||||
-rw-r--r-- | sys/i386/i386/mp_machdep.c | 2 | ||||
-rw-r--r-- | sys/i386/i386/mptable.c | 2 | ||||
-rw-r--r-- | sys/i386/include/md_var.h | 2 | ||||
-rw-r--r-- | sys/i386/include/mptable.h | 2 |
15 files changed, 19 insertions, 19 deletions
diff --git a/sys/amd64/amd64/identcpu.c b/sys/amd64/amd64/identcpu.c index 86aa9ba..2d48d8e 100644 --- a/sys/amd64/amd64/identcpu.c +++ b/sys/amd64/amd64/identcpu.c @@ -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) diff --git a/sys/amd64/amd64/initcpu.c b/sys/amd64/amd64/initcpu.c index 9f13eb6..2c4edef 100644 --- a/sys/amd64/amd64/initcpu.c +++ b/sys/amd64/amd64/initcpu.c @@ -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 diff --git a/sys/amd64/amd64/locore.S b/sys/amd64/amd64/locore.S index b9efaf6..f6ebc88 100644 --- a/sys/amd64/amd64/locore.S +++ b/sys/amd64/amd64/locore.S @@ -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 diff --git a/sys/amd64/amd64/locore.s b/sys/amd64/amd64/locore.s index b9efaf6..f6ebc88 100644 --- a/sys/amd64/amd64/locore.s +++ b/sys/amd64/amd64/locore.s @@ -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 diff --git a/sys/amd64/amd64/mp_machdep.c b/sys/amd64/amd64/mp_machdep.c index 9b24c6f..599f182 100644 --- a/sys/amd64/amd64/mp_machdep.c +++ b/sys/amd64/amd64/mp_machdep.c @@ -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; diff --git a/sys/amd64/amd64/mptable.c b/sys/amd64/amd64/mptable.c index 9b24c6f..599f182 100644 --- a/sys/amd64/amd64/mptable.c +++ b/sys/amd64/amd64/mptable.c @@ -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; diff --git a/sys/amd64/include/md_var.h b/sys/amd64/include/md_var.h index 107c90e..0f3922c 100644 --- a/sys/amd64/include/md_var.h +++ b/sys/amd64/include/md_var.h @@ -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[]; diff --git a/sys/amd64/include/mptable.h b/sys/amd64/include/mptable.h index 9b24c6f..599f182 100644 --- a/sys/amd64/include/mptable.h +++ b/sys/amd64/include/mptable.h @@ -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; diff --git a/sys/i386/i386/identcpu.c b/sys/i386/i386/identcpu.c index 86aa9ba..2d48d8e 100644 --- a/sys/i386/i386/identcpu.c +++ b/sys/i386/i386/identcpu.c @@ -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) diff --git a/sys/i386/i386/initcpu.c b/sys/i386/i386/initcpu.c index 9f13eb6..2c4edef 100644 --- a/sys/i386/i386/initcpu.c +++ b/sys/i386/i386/initcpu.c @@ -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 diff --git a/sys/i386/i386/locore.s b/sys/i386/i386/locore.s index b9efaf6..f6ebc88 100644 --- a/sys/i386/i386/locore.s +++ b/sys/i386/i386/locore.s @@ -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 diff --git a/sys/i386/i386/mp_machdep.c b/sys/i386/i386/mp_machdep.c index 9b24c6f..599f182 100644 --- a/sys/i386/i386/mp_machdep.c +++ b/sys/i386/i386/mp_machdep.c @@ -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; diff --git a/sys/i386/i386/mptable.c b/sys/i386/i386/mptable.c index 9b24c6f..599f182 100644 --- a/sys/i386/i386/mptable.c +++ b/sys/i386/i386/mptable.c @@ -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; diff --git a/sys/i386/include/md_var.h b/sys/i386/include/md_var.h index 107c90e..0f3922c 100644 --- a/sys/i386/include/md_var.h +++ b/sys/i386/include/md_var.h @@ -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[]; diff --git a/sys/i386/include/mptable.h b/sys/i386/include/mptable.h index 9b24c6f..599f182 100644 --- a/sys/i386/include/mptable.h +++ b/sys/i386/include/mptable.h @@ -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; |