diff options
| author | Ingo Molnar <mingo@kernel.org> | 2016-04-13 11:15:39 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-04-13 11:15:39 +0200 |
| commit | cb44d0cfc2969999a4d9e20e4fd8749fec6c5498 (patch) | |
| tree | 51fad115c6e18d0df352531baa1eb9bcb7aaa5e9 /arch/x86/oprofile/nmi_int.c | |
| parent | 482dd2ef124484601adea82e5e806e81e2bc5521 (diff) | |
| parent | d7847a7017b2a2759dd5590c0cffdbdf2994918e (diff) | |
| download | linux-cb44d0cfc2969999a4d9e20e4fd8749fec6c5498.tar.bz2 | |
Merge branch 'x86/cpu' into x86/asm, to merge more patches
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/oprofile/nmi_int.c')
| -rw-r--r-- | arch/x86/oprofile/nmi_int.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/oprofile/nmi_int.c b/arch/x86/oprofile/nmi_int.c index 0e07e0968c3a..25171e9595f7 100644 --- a/arch/x86/oprofile/nmi_int.c +++ b/arch/x86/oprofile/nmi_int.c @@ -636,7 +636,7 @@ static int __init ppro_init(char **cpu_type) __u8 cpu_model = boot_cpu_data.x86_model; struct op_x86_model_spec *spec = &op_ppro_spec; /* default */ - if (force_cpu_type == arch_perfmon && cpu_has_arch_perfmon) + if (force_cpu_type == arch_perfmon && boot_cpu_has(X86_FEATURE_ARCH_PERFMON)) return 0; /* @@ -761,7 +761,7 @@ int __init op_nmi_init(struct oprofile_operations *ops) if (cpu_type) break; - if (!cpu_has_arch_perfmon) + if (!boot_cpu_has(X86_FEATURE_ARCH_PERFMON)) return -ENODEV; /* use arch perfmon as fallback */ |