This is a note to let you know that I've just added the patch titled
x86/cpufeature: Remove cpu_has_arch_perfmon
to the 4.4-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
x86-cpufeature-remove-cpu_has_arch_perfmon.patch
and it can be found in the queue-4.4 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <[email protected]> know about it.
From 7b5e74e637e4a977c7cf40fd7de332f60b68180e Mon Sep 17 00:00:00 2001
From: Borislav Petkov <[email protected]>
Date: Tue, 29 Mar 2016 17:41:54 +0200
Subject: x86/cpufeature: Remove cpu_has_arch_perfmon
From: Borislav Petkov <[email protected]>
commit 7b5e74e637e4a977c7cf40fd7de332f60b68180e upstream.
Use boot_cpu_has() instead.
Signed-off-by: Borislav Petkov <[email protected]>
Cc: Linus Torvalds <[email protected]>
Cc: Peter Zijlstra <[email protected]>
Cc: Thomas Gleixner <[email protected]>
Cc: [email protected]
Link: http://lkml.kernel.org/r/[email protected]
Signed-off-by: Ingo Molnar <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
---
arch/x86/include/asm/cpufeature.h | 1 -
arch/x86/oprofile/nmi_int.c | 4 ++--
arch/x86/oprofile/op_model_ppro.c | 2 +-
3 files changed, 3 insertions(+), 4 deletions(-)
--- a/arch/x86/include/asm/cpufeature.h
+++ b/arch/x86/include/asm/cpufeature.h
@@ -380,7 +380,6 @@ extern const char * const x86_bug_flags[
#define cpu_has_avx2 boot_cpu_has(X86_FEATURE_AVX2)
#define cpu_has_clflush boot_cpu_has(X86_FEATURE_CLFLUSH)
#define cpu_has_gbpages boot_cpu_has(X86_FEATURE_GBPAGES)
-#define cpu_has_arch_perfmon boot_cpu_has(X86_FEATURE_ARCH_PERFMON)
#define cpu_has_pat boot_cpu_has(X86_FEATURE_PAT)
#define cpu_has_x2apic boot_cpu_has(X86_FEATURE_X2APIC)
#define cpu_has_xsave boot_cpu_has(X86_FEATURE_XSAVE)
--- a/arch/x86/oprofile/nmi_int.c
+++ b/arch/x86/oprofile/nmi_int.c
@@ -635,7 +635,7 @@ static int __init ppro_init(char **cpu_t
__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;
/*
@@ -760,7 +760,7 @@ int __init op_nmi_init(struct oprofile_o
if (cpu_type)
break;
- if (!cpu_has_arch_perfmon)
+ if (!boot_cpu_has(X86_FEATURE_ARCH_PERFMON))
return -ENODEV;
/* use arch perfmon as fallback */
--- a/arch/x86/oprofile/op_model_ppro.c
+++ b/arch/x86/oprofile/op_model_ppro.c
@@ -75,7 +75,7 @@ static void ppro_setup_ctrs(struct op_x8
u64 val;
int i;
- if (cpu_has_arch_perfmon) {
+ if (boot_cpu_has(X86_FEATURE_ARCH_PERFMON)) {
union cpuid10_eax eax;
eax.full = cpuid_eax(0xa);
Patches currently in stable-queue which might be from [email protected] are
queue-4.4/x86-fpu-disable-mpx-when-eagerfpu-is-off.patch
queue-4.4/x86-fpu-disable-avx-when-eagerfpu-is-off.patch
queue-4.4/x86-cpufeature-remove-cpu_has_xmm2.patch
queue-4.4/x86-cpufeature-remove-unused-and-seldomly-used-cpu_has_xx-macros.patch
queue-4.4/x86-cpufeature-replace-cpu_has_avx2-with-boot_cpu_has-usage.patch
queue-4.4/x86-cpufeature-replace-cpu_has_aes-with-boot_cpu_has-usage.patch
queue-4.4/x86-fpu-fix-eager-fpu-handling-on-legacy-fpu-machines.patch
queue-4.4/x86-cpufeature-remove-cpu_has_pse.patch
queue-4.4/x86-cpufeature-remove-cpu_has_osxsave.patch
queue-4.4/x86-mm-pat-x86-cpufeature-remove-cpu_has_pat.patch
queue-4.4/x86-fpu-revert-x86-fpu-disable-avx-when-eagerfpu-is-off.patch
queue-4.4/x86-cpufeature-remove-cpu_has_gbpages.patch
queue-4.4/x86-fpu-fix-early-fpu-command-line-parsing.patch
queue-4.4/x86-cpufeature-remove-cpu_has_x2apic.patch
queue-4.4/x86-cpufeature-remove-cpu_has_clflush.patch
queue-4.4/x86-cpufeature-remove-cpu_has_arch_perfmon.patch
------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
lmpx.com only provides a reader for public news (NNTP) servers. It is not
affiliated with the servers or forums shown here and is not responsible for
the content of articles, which is written by their respective authors.