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/microblaze/Kconfig | 1 -
arch/microblaze/Makefile | 2 --
arch/microblaze/oprofile/Makefile | 14 ------------
.../microblaze/oprofile/microblaze_oprofile.c | 22 -------------------
4 files changed, 39 deletions(-)
delete mode 100644 arch/microblaze/oprofile/Makefile
delete mode 100644 arch/microblaze/oprofile/microblaze_oprofile.c
diff --git a/arch/microblaze/Kconfig b/arch/microblaze/Kconfig
index f82795592ce5..25a5a3fb14aa 100644
--- a/arch/microblaze/Kconfig
+++ b/arch/microblaze/Kconfig
@@ -30,7 +30,6 @@ config MICROBLAZE
select HAVE_FTRACE_MCOUNT_RECORD
select HAVE_FUNCTION_GRAPH_TRACER
select HAVE_FUNCTION_TRACER
- select HAVE_OPROFILE
select HAVE_PCI
select IRQ_DOMAIN
select XILINX_INTC
diff --git a/arch/microblaze/Makefile b/arch/microblaze/Makefile
index bb980891816d..b41f323e1fde 100644
--- a/arch/microblaze/Makefile
+++ b/arch/microblaze/Makefile
@@ -54,8 +54,6 @@ core-y += arch/microblaze/kernel/
core-y += arch/microblaze/mm/
core-$(CONFIG_PCI) += arch/microblaze/pci/
-drivers-$(CONFIG_OPROFILE) += arch/microblaze/oprofile/
-
boot := arch/microblaze/boot
# Are we making a simpleImage.<boardname> target? If so, crack out the boardname
diff --git a/arch/microblaze/oprofile/Makefile b/arch/microblaze/oprofile/Makefile
deleted file mode 100644
index 107f2f55d995..000000000000
--- a/arch/microblaze/oprofile/Makefile
+++ /dev/null
@@ -1,14 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0
-#
-# arch/microblaze/oprofile/Makefile
-#
-
-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) microblaze_oprofile.o
diff --git a/arch/microblaze/oprofile/microblaze_oprofile.c b/arch/microblaze/oprofile/microblaze_oprofile.c
deleted file mode 100644
index def17e59888e..000000000000
--- a/arch/microblaze/oprofile/microblaze_oprofile.c
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Microblaze oprofile code
- *
- * Copyright (C) 2009 Michal Simek <[email protected]>
- * Copyright (C) 2009 PetaLogix
- *
- * This file is subject to the terms and conditions of the GNU General Public
- * License. See the file "COPYING" in the main directory of this archive
- * for more details.
- */
-
-#include <linux/oprofile.h>
-#include <linux/init.h>
-
-int __init oprofile_arch_init(struct oprofile_operations *ops)
-{
- return -1;
-}
-
-void oprofile_arch_exit(void)
-{
-}
--
2.25.0.rc1.19.g042ed3e048af
On 14. 01. 21 12:35, 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]>
> ---
> arch/microblaze/Kconfig | 1 -
> arch/microblaze/Makefile | 2 --
> arch/microblaze/oprofile/Makefile | 14 ------------
> .../microblaze/oprofile/microblaze_oprofile.c | 22 -------------------
> 4 files changed, 39 deletions(-)
> delete mode 100644 arch/microblaze/oprofile/Makefile
> delete mode 100644 arch/microblaze/oprofile/microblaze_oprofile.c
>
> diff --git a/arch/microblaze/Kconfig b/arch/microblaze/Kconfig
> index f82795592ce5..25a5a3fb14aa 100644
> --- a/arch/microblaze/Kconfig
> +++ b/arch/microblaze/Kconfig
> @@ -30,7 +30,6 @@ config MICROBLAZE
> select HAVE_FTRACE_MCOUNT_RECORD
> select HAVE_FUNCTION_GRAPH_TRACER
> select HAVE_FUNCTION_TRACER
> - select HAVE_OPROFILE
> select HAVE_PCI
> select IRQ_DOMAIN
> select XILINX_INTC
> diff --git a/arch/microblaze/Makefile b/arch/microblaze/Makefile
> index bb980891816d..b41f323e1fde 100644
> --- a/arch/microblaze/Makefile
> +++ b/arch/microblaze/Makefile
> @@ -54,8 +54,6 @@ core-y += arch/microblaze/kernel/
> core-y += arch/microblaze/mm/
> core-$(CONFIG_PCI) += arch/microblaze/pci/
>
> -drivers-$(CONFIG_OPROFILE) += arch/microblaze/oprofile/
> -
> boot := arch/microblaze/boot
>
> # Are we making a simpleImage.<boardname> target? If so, crack out the boardname
> diff --git a/arch/microblaze/oprofile/Makefile b/arch/microblaze/oprofile/Makefile
> deleted file mode 100644
> index 107f2f55d995..000000000000
> --- a/arch/microblaze/oprofile/Makefile
> +++ /dev/null
> @@ -1,14 +0,0 @@
> -# SPDX-License-Identifier: GPL-2.0
> -#
> -# arch/microblaze/oprofile/Makefile
> -#
> -
> -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) microblaze_oprofile.o
> diff --git a/arch/microblaze/oprofile/microblaze_oprofile.c b/arch/microblaze/oprofile/microblaze_oprofile.c
> deleted file mode 100644
> index def17e59888e..000000000000
> --- a/arch/microblaze/oprofile/microblaze_oprofile.c
> +++ /dev/null
> @@ -1,22 +0,0 @@
> -/*
> - * Microblaze oprofile code
> - *
> - * Copyright (C) 2009 Michal Simek <[email protected]>
> - * Copyright (C) 2009 PetaLogix
> - *
> - * This file is subject to the terms and conditions of the GNU General Public
> - * License. See the file "COPYING" in the main directory of this archive
> - * for more details.
> - */
> -
> -#include <linux/oprofile.h>
> -#include <linux/init.h>
> -
> -int __init oprofile_arch_init(struct oprofile_operations *ops)
> -{
> - return -1;
> -}
> -
> -void oprofile_arch_exit(void)
> -{
> -}
>
Acked-by: Michal Simek <[email protected]>
Thanks,
Michal
--
Michal Simek, Ing. (M.Eng), OpenPGP -> KeyID: FE3D1F91
w: http://www.monstr.eu p: +42-0-721842854
Maintainer of Linux kernel - Xilinx Microblaze
Maintainer of Linux kernel - Xilinx Zynq ARM and ZynqMP ARM64 SoCs
U-Boot custodian - Xilinx Microblaze/Zynq/ZynqMP/Versal SoCs