Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7b5e74e6 authored by Borislav Petkov's avatar Borislav Petkov Committed by Ingo Molnar
Browse files

x86/cpufeature: Remove cpu_has_arch_perfmon 



Use boot_cpu_has() instead.

Signed-off-by: default avatarBorislav Petkov <bp@suse.de>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: oprofile-list@lists.sf.net
Link: http://lkml.kernel.org/r/1459266123-21878-2-git-send-email-bp@alien8.de


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 1e6d88cc

arch/x86/include/asm/cpufeature.h

+0 −1
Original line number Diff line number Diff line
@@ -131,7 +131,6 @@ extern const char * const x86_bug_flags[NBUGINTS*32]; 
#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)

arch/x86/oprofile/nmi_int.c

+2 −2
Original line number Diff line number Diff line
@@ -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 */

arch/x86/oprofile/op_model_ppro.c

+1 −1
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ static void ppro_setup_ctrs(struct op_x86_model_spec const *model, 
	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);