Page MenuHomeFreeBSD
Files F157822406

D39904.diff
No OneTemporary
Actions

D39904.diff
View Options

diff --git a/sys/dev/hwpmc/hwpmc_intel.c b/sys/dev/hwpmc/hwpmc_intel.c
--- a/sys/dev/hwpmc/hwpmc_intel.c
+++ b/sys/dev/hwpmc/hwpmc_intel.c
@@ -99,7 +99,7 @@
family, model, stepping);
switch (cpu_id & 0xF00) {
- case 0x600: /* Pentium Pro, Celeron, Pentium II & III */
+ case 0x600:
switch (model) {
case 0xE:
cputype = PMC_CPU_INTEL_CORE;
diff --git a/sys/i386/include/pmc_mdep.h b/sys/i386/include/pmc_mdep.h
--- a/sys/i386/include/pmc_mdep.h
+++ b/sys/i386/include/pmc_mdep.h
@@ -45,10 +45,6 @@
* TSC The timestamp counter
* K7 AMD Athlon XP/MP and other 32 bit processors.
* K8 AMD Athlon64 and Opteron PMCs in 32 bit mode.
- * PIV Intel P4/HTT and P4/EMT64
- * PPRO Intel Pentium Pro, Pentium-II, Pentium-III, Celeron and
- * Pentium-M processors
- * PENTIUM Intel Pentium MMX.
* IAP Intel Core/Core2/Atom programmable PMCs.
* IAF Intel fixed-function PMCs.
* UCP Intel Uncore programmable PMCs.
diff --git a/sys/sys/pmc.h b/sys/sys/pmc.h
--- a/sys/sys/pmc.h
+++ b/sys/sys/pmc.h
@@ -86,13 +86,6 @@
#define __PMC_CPUS() \
__PMC_CPU(AMD_K7, 0x00, "AMD K7") \
__PMC_CPU(AMD_K8, 0x01, "AMD K8") \
- __PMC_CPU(INTEL_P5, 0x80, "Intel Pentium") \
- __PMC_CPU(INTEL_P6, 0x81, "Intel Pentium Pro") \
- __PMC_CPU(INTEL_CL, 0x82, "Intel Celeron") \
- __PMC_CPU(INTEL_PII, 0x83, "Intel Pentium II") \
- __PMC_CPU(INTEL_PIII, 0x84, "Intel Pentium III") \
- __PMC_CPU(INTEL_PM, 0x85, "Intel Pentium M") \
- __PMC_CPU(INTEL_PIV, 0x86, "Intel Pentium IV") \
__PMC_CPU(INTEL_CORE, 0x87, "Intel Core Solo/Duo") \
__PMC_CPU(INTEL_CORE2, 0x88, "Intel Core2") \
__PMC_CPU(INTEL_CORE2EXTREME, 0x89, "Intel Core2 Extreme") \
@@ -155,9 +148,6 @@
__PMC_CLASS(TSC, 0x00, "CPU Timestamp counter") \
__PMC_CLASS(K7, 0x01, "AMD K7 performance counters") \
__PMC_CLASS(K8, 0x02, "AMD K8 performance counters") \
- __PMC_CLASS(P5, 0x03, "Intel Pentium counters") \
- __PMC_CLASS(P6, 0x04, "Intel Pentium Pro counters") \
- __PMC_CLASS(P4, 0x05, "Intel Pentium-IV counters") \
__PMC_CLASS(IAF, 0x06, "Intel Core2/Atom, fixed function") \
__PMC_CLASS(IAP, 0x07, "Intel Core...Atom, programmable") \
__PMC_CLASS(UCF, 0x08, "Intel Uncore fixed function") \

File Metadata

Mime Type
text/plain
Expires
Tue, May 26, 2:19 PM (17 h, 50 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
33531755
Default Alt Text
D39904.diff (2 KB)

Event Timeline