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]>
---
arch/arc/Kconfig | 1 -
arch/arc/Makefile | 2 --
arch/arc/oprofile/Makefile | 10 ----------
arch/arc/oprofile/common.c | 23 -----------------------
4 files changed, 36 deletions(-)
delete mode 100644 arch/arc/oprofile/Makefile
delete mode 100644 arch/arc/oprofile/common.c
diff --git a/arch/arc/Kconfig b/arch/arc/Kconfig
index b55ca77f619b..bc8d6aecfbbd 100644
--- a/arch/arc/Kconfig
+++ b/arch/arc/Kconfig
@@ -37,7 +37,6 @@ config ARC
select HAVE_KPROBES
select HAVE_KRETPROBES
select HAVE_MOD_ARCH_SPECIFIC
- select HAVE_OPROFILE
select HAVE_PERF_EVENTS
select HANDLE_DOMAIN_IRQ
select IRQ_DOMAIN
diff --git a/arch/arc/Makefile b/arch/arc/Makefile
index 578bdbbb0fa7..4392c9c189c4 100644
--- a/arch/arc/Makefile
+++ b/arch/arc/Makefile
@@ -96,8 +96,6 @@ core-$(CONFIG_ARC_PLAT_TB10X) += arch/arc/plat-tb10x/
core-$(CONFIG_ARC_PLAT_AXS10X) += arch/arc/plat-axs10x/
core-$(CONFIG_ARC_SOC_HSDK) += arch/arc/plat-hsdk/
-drivers-$(CONFIG_OPROFILE) += arch/arc/oprofile/
-
libs-y += arch/arc/lib/ $(LIBGCC)
boot := arch/arc/boot
diff --git a/arch/arc/oprofile/Makefile b/arch/arc/oprofile/Makefile
deleted file mode 100644
index 698367bb41d0..000000000000
--- a/arch/arc/oprofile/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-# 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 )
-
-oprofile-y := $(DRIVER_OBJS) common.o
diff --git a/arch/arc/oprofile/common.c b/arch/arc/oprofile/common.c
deleted file mode 100644
index 86bf5899533b..000000000000
--- a/arch/arc/oprofile/common.c
+++ /dev/null
@@ -1,23 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-only
-/*
- * Copyright (C) 2004, 2007-2010, 2011-2012 Synopsys, Inc. (http://www.synopsys.com)
- *
- * Based on orig code from @author John Levon <[email protected]>
- */
-
-#include <linux/oprofile.h>
-#include <linux/perf_event.h>
-
-int __init oprofile_arch_init(struct oprofile_operations *ops)
-{
- /*
- * A failure here, forces oprofile core to switch to Timer based PC
- * sampling, which will happen if say perf is not enabled/available
- */
- return oprofile_perf_init(ops);
-}
-
-void oprofile_arch_exit(void)
-{
- oprofile_perf_exit();
-}
--
2.25.0.rc1.19.g042ed3e048af
On 1/14/21 3:35 AM, Viresh Kumar wrote:
> 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: Vineet Gupta <[email protected]>
I presume this doesn't need to go through ARC tree.
-Vineet
> ---
> arch/arc/Kconfig | 1 -
> arch/arc/Makefile | 2 --
> arch/arc/oprofile/Makefile | 10 ----------
> arch/arc/oprofile/common.c | 23 -----------------------
> 4 files changed, 36 deletions(-)
> delete mode 100644 arch/arc/oprofile/Makefile
> delete mode 100644 arch/arc/oprofile/common.c
>
> diff --git a/arch/arc/Kconfig b/arch/arc/Kconfig
> index b55ca77f619b..bc8d6aecfbbd 100644
> --- a/arch/arc/Kconfig
> +++ b/arch/arc/Kconfig
> @@ -37,7 +37,6 @@ config ARC
> select HAVE_KPROBES
> select HAVE_KRETPROBES
> select HAVE_MOD_ARCH_SPECIFIC
> - select HAVE_OPROFILE
> select HAVE_PERF_EVENTS
> select HANDLE_DOMAIN_IRQ
> select IRQ_DOMAIN
> diff --git a/arch/arc/Makefile b/arch/arc/Makefile
> index 578bdbbb0fa7..4392c9c189c4 100644
> --- a/arch/arc/Makefile
> +++ b/arch/arc/Makefile
> @@ -96,8 +96,6 @@ core-$(CONFIG_ARC_PLAT_TB10X) += arch/arc/plat-tb10x/
> core-$(CONFIG_ARC_PLAT_AXS10X) += arch/arc/plat-axs10x/
> core-$(CONFIG_ARC_SOC_HSDK) += arch/arc/plat-hsdk/
>
> -drivers-$(CONFIG_OPROFILE) += arch/arc/oprofile/
> -
> libs-y += arch/arc/lib/ $(LIBGCC)
>
> boot := arch/arc/boot
> diff --git a/arch/arc/oprofile/Makefile b/arch/arc/oprofile/Makefile
> deleted file mode 100644
> index 698367bb41d0..000000000000
> --- a/arch/arc/oprofile/Makefile
> +++ /dev/null
> @@ -1,10 +0,0 @@
> -# 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 )
> -
> -oprofile-y := $(DRIVER_OBJS) common.o
> diff --git a/arch/arc/oprofile/common.c b/arch/arc/oprofile/common.c
> deleted file mode 100644
> index 86bf5899533b..000000000000
> --- a/arch/arc/oprofile/common.c
> +++ /dev/null
> @@ -1,23 +0,0 @@
> -// SPDX-License-Identifier: GPL-2.0-only
> -/*
> - * Copyright (C) 2004, 2007-2010, 2011-2012 Synopsys, Inc. (http://www.synopsys.com)
> - *
> - * Based on orig code from @author John Levon <[email protected]>
> - */
> -
> -#include <linux/oprofile.h>
> -#include <linux/perf_event.h>
> -
> -int __init oprofile_arch_init(struct oprofile_operations *ops)
> -{
> - /*
> - * A failure here, forces oprofile core to switch to Timer based PC
> - * sampling, which will happen if say perf is not enabled/available
> - */
> - return oprofile_perf_init(ops);
> -}
> -
> -void oprofile_arch_exit(void)
> -{
> - oprofile_perf_exit();
> -}
On 14-01-21, 17:51, Vineet Gupta wrote:
> On 1/14/21 3:35 AM, Viresh Kumar wrote:
> > 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: Vineet Gupta <[email protected]>
>
> I presume this doesn't need to go through ARC tree.
Yes.
--
viresh