x86_64: simplify oprofile build

Instead of copying the i386 Makefile and handling path substitutions
just use the i386 oprofile Makefile.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

diff --git a/arch/x86_64/Makefile b/arch/x86_64/Makefile
index b024e4a86895cea767fa5090074f75b60e0d7078..c76351c13bdd5350d566741e972df9ca76764b7e 100644 (file)
--- a/arch/x86_64/Makefile
+++ b/arch/x86_64/Makefile
@@ -80,7 +80,7 @@ core-y                                        += arch/x86_64/kernel/ \
                                           arch/x86_64/vdso/
 core-$(CONFIG_IA32_EMULATION)          += arch/x86_64/ia32/
 drivers-$(CONFIG_PCI)                  += arch/x86_64/pci/
-drivers-$(CONFIG_OPROFILE)             += arch/x86_64/oprofile/
+drivers-$(CONFIG_OPROFILE)             += arch/i386/oprofile/
 
 boot := arch/x86_64/boot
 

diff --git a/arch/x86_64/oprofile/Makefile b/arch/x86_64/oprofile/Makefile
deleted file mode 100644 (file)
index 6be3268..0000000
--- a/arch/x86_64/oprofile/Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# oprofile for x86-64.
-# Just reuse the one from i386. 
-#
-
-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 := init.o backtrace.o
-OPROFILE-$(CONFIG_X86_LOCAL_APIC) += nmi_int.o op_model_athlon.o op_model_p4.o \
-                                    op_model_ppro.o
-OPROFILE-$(CONFIG_X86_IO_APIC)    += nmi_timer_int.o 
-
-oprofile-y = $(DRIVER_OBJS) $(addprefix ../../i386/oprofile/, $(OPROFILE-y))