diff options
Diffstat (limited to 'arch')
-rw-r--r-- | arch/x86/kernel/cpu/perf_counter.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/arch/x86/kernel/cpu/perf_counter.c b/arch/x86/kernel/cpu/perf_counter.c index bed1c4c2f251..7e346d4bc0fb 100644 --- a/arch/x86/kernel/cpu/perf_counter.c +++ b/arch/x86/kernel/cpu/perf_counter.c | |||
@@ -1583,10 +1583,8 @@ static int p6_pmu_init(void) | |||
1583 | break; | 1583 | break; |
1584 | case 9: | 1584 | case 9: |
1585 | case 13: | 1585 | case 13: |
1586 | /* for Pentium M, we need to check if PMU exist */ | 1586 | /* Pentium M */ |
1587 | rdmsr(MSR_IA32_MISC_ENABLE, low, high); | 1587 | break; |
1588 | if (low & MSR_IA32_MISC_ENABLE_EMON) | ||
1589 | break; | ||
1590 | default: | 1588 | default: |
1591 | pr_cont("unsupported p6 CPU model %d ", | 1589 | pr_cont("unsupported p6 CPU model %d ", |
1592 | boot_cpu_data.x86_model); | 1590 | boot_cpu_data.x86_model); |