Skip to content
This repository was archived by the owner on Nov 8, 2023. It is now read-only.

Commit a6a0683

Browse files
committed
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: Christoph Hellwig <[email protected]> Suggested-by: Linus Torvalds <[email protected]> Signed-off-by: Viresh Kumar <[email protected]> Acked-by: Robert Richter <[email protected]> Acked-by: William Cohen <[email protected]> Acked-by: Al Viro <[email protected]> Acked-by: Thomas Gleixner <[email protected]>
1 parent 2083fec commit a6a0683

File tree

13 files changed

+1
-2602
lines changed

13 files changed

+1
-2602
lines changed

arch/x86/Kconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,6 @@ config X86
206206
select HAVE_MOVE_PMD
207207
select HAVE_MOVE_PUD
208208
select HAVE_NMI
209-
select HAVE_OPROFILE
210209
select HAVE_OPTPROBES
211210
select HAVE_PCSPKR_PLATFORM
212211
select HAVE_PERF_EVENTS

arch/x86/Makefile

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -229,9 +229,6 @@ core-y += arch/x86/
229229
drivers-$(CONFIG_MATH_EMULATION) += arch/x86/math-emu/
230230
drivers-$(CONFIG_PCI) += arch/x86/pci/
231231

232-
# must be linked after kernel/
233-
drivers-$(CONFIG_OPROFILE) += arch/x86/oprofile/
234-
235232
# suspend and hibernation support
236233
drivers-$(CONFIG_PM) += arch/x86/power/
237234

arch/x86/include/asm/nmi.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99

1010
#ifdef CONFIG_X86_LOCAL_APIC
1111

12-
extern int avail_to_resrv_perfctr_nmi_bit(unsigned int);
1312
extern int reserve_perfctr_nmi(unsigned int);
1413
extern void release_perfctr_nmi(unsigned int);
1514
extern int reserve_evntsel_nmi(unsigned int);

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

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* local apic based NMI watchdog for various CPUs.
44
*
55
* This file also handles reservation of performance counters for coordination
6-
* with other users (like oprofile).
6+
* with other users.
77
*
88
* Note that these events normally don't tick when the CPU idles. This means
99
* the frequency varies with CPU load.
@@ -105,15 +105,6 @@ static inline unsigned int nmi_evntsel_msr_to_bit(unsigned int msr)
105105

106106
}
107107

108-
/* checks for a bit availability (hack for oprofile) */
109-
int avail_to_resrv_perfctr_nmi_bit(unsigned int counter)
110-
{
111-
BUG_ON(counter > NMI_MAX_COUNTER_BITS);
112-
113-
return !test_bit(counter, perfctr_nmi_owner);
114-
}
115-
EXPORT_SYMBOL(avail_to_resrv_perfctr_nmi_bit);
116-
117108
int reserve_perfctr_nmi(unsigned int msr)
118109
{
119110
unsigned int counter;

arch/x86/oprofile/Makefile

Lines changed: 0 additions & 12 deletions
This file was deleted.

arch/x86/oprofile/backtrace.c

Lines changed: 0 additions & 127 deletions
This file was deleted.

arch/x86/oprofile/init.c

Lines changed: 0 additions & 38 deletions
This file was deleted.

0 commit comments

Comments
 (0)