From: Mikael Pettersson <mikpe@csd.uu.se>
Update perfctr/x86 to handle the new 90nm Pentium-M (Dothan).
Signed-off-by: Mikael Pettersson <mikpe@csd.uu.se>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---
25-akpm/drivers/perfctr/x86.c | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff -puN drivers/perfctr/x86.c~perfctr-dothan-support drivers/perfctr/x86.c
--- 25/drivers/perfctr/x86.c~perfctr-dothan-support Wed Jun 9 14:52:18 2004
+++ 25-akpm/drivers/perfctr/x86.c Wed Jun 9 14:52:18 2004
@@ -1239,7 +1239,8 @@ static int __init intel_init(void)
clear_counters = p5_clear_counters;
return 0;
case 6:
- if (current_cpu_data.x86_model == 9) { /* Pentium M */
+ if (current_cpu_data.x86_model == 9 ||
+ current_cpu_data.x86_model == 13) { /* Pentium M */
/* Pentium M added the MISC_ENABLE MSR from P4. */
rdmsr_low(MSR_IA32_MISC_ENABLE, misc_enable);
if (!(misc_enable & MSR_IA32_MISC_ENABLE_PERF_AVAIL))
@@ -1263,7 +1264,8 @@ static int __init intel_init(void)
cpu_isuspend = p6_isuspend;
cpu_iresume = p6_iresume;
/* P-M apparently inherited P4's LVTPC auto-masking :-( */
- if (current_cpu_data.x86_model == 9)
+ if (current_cpu_data.x86_model == 9 ||
+ current_cpu_data.x86_model == 13)
lvtpc_reinit_needed = 1;
}
#endif
_