Commit a6a0683b authored by Viresh Kumar's avatar Viresh Kumar
Browse files

arch: x86: Remove CONFIG_OPROFILE support 



The "oprofile" user-space tools don't use the kernel OPROFILE support
any more, and haven't in a long time. User-space has been converted to
the perf interfaces.

Remove the old oprofile's architecture specific support.

Suggested-by: default avatarChristoph Hellwig <hch@infradead.org>
Suggested-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: default avatarViresh Kumar <viresh.kumar@linaro.org>
Acked-by: default avatarRobert Richter <rric@kernel.org>
Acked-by: default avatarWilliam Cohen <wcohen@redhat.com>
Acked-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Acked-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 2083fecd

arch/x86/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -206,7 +206,6 @@ config X86 
	select HAVE_MOVE_PMD

	select HAVE_MOVE_PUD

	select HAVE_NMI

	select HAVE_OPROFILE

	select HAVE_OPTPROBES

	select HAVE_PCSPKR_PLATFORM

	select HAVE_PERF_EVENTS

arch/x86/Makefile

+0 −3
Original line number Diff line number Diff line
@@ -229,9 +229,6 @@ core-y += arch/x86/ 
drivers-$(CONFIG_MATH_EMULATION) += arch/x86/math-emu/

drivers-$(CONFIG_PCI)            += arch/x86/pci/



# must be linked after kernel/

drivers-$(CONFIG_OPROFILE) += arch/x86/oprofile/



# suspend and hibernation support

drivers-$(CONFIG_PM) += arch/x86/power/

arch/x86/include/asm/nmi.h

+0 −1
Original line number Diff line number Diff line
@@ -9,7 +9,6 @@ 


#ifdef CONFIG_X86_LOCAL_APIC



extern int avail_to_resrv_perfctr_nmi_bit(unsigned int);

extern int reserve_perfctr_nmi(unsigned int);

extern void release_perfctr_nmi(unsigned int);

extern int reserve_evntsel_nmi(unsigned int);

arch/x86/kernel/cpu/perfctr-watchdog.c

+1 −10
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
 * local apic based NMI watchdog for various CPUs.

 *

 * This file also handles reservation of performance counters for coordination

 * with other users (like oprofile).

 * with other users.

 *

 * Note that these events normally don't tick when the CPU idles. This means

 * the frequency varies with CPU load.
@@ -105,15 +105,6 @@ static inline unsigned int nmi_evntsel_msr_to_bit(unsigned int msr) 


}



/* checks for a bit availability (hack for oprofile) */

int avail_to_resrv_perfctr_nmi_bit(unsigned int counter)

{

	BUG_ON(counter > NMI_MAX_COUNTER_BITS);



	return !test_bit(counter, perfctr_nmi_owner);

}

EXPORT_SYMBOL(avail_to_resrv_perfctr_nmi_bit);



int reserve_perfctr_nmi(unsigned int msr)

{

	unsigned int counter;

arch/x86/oprofile/Makefile

deleted100644 → 0
+0 −12
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

obj-$(CONFIG_OPROFILE) += oprofile.o



DRIVER_OBJS = $(addprefix ../../../drivers/oprofile/, \

		oprof.o cpu_buffer.o buffer_sync.o \

		event_buffer.o oprofile_files.o \

		oprofilefs.o oprofile_stats.o  \

		timer_int.o nmi_timer_int.o )



oprofile-y				:= $(DRIVER_OBJS) init.o backtrace.o

oprofile-$(CONFIG_X86_LOCAL_APIC) 	+= nmi_int.o op_model_amd.o \

					   op_model_ppro.o op_model_p4.o