Merge to Fedora kernel-2.6.17-1.2187_FC5 patched with stable patch-2.6.17.13-vs2...

[linux-2.6.git] / arch / x86_64 / oprofile / Makefile

diff --git a/arch/x86_64/oprofile/Makefile b/arch/x86_64/oprofile/Makefile
index 6be3268..589a796 100644 (file)
--- a/arch/x86_64/oprofile/Makefile
+++ b/arch/x86_64/oprofile/Makefile
@@ -11,9 +11,12 @@ DRIVER_OBJS = $(addprefix ../../../drivers/oprofile/, \
        oprofilefs.o oprofile_stats.o \
        timer_int.o )
 
+ifdef CONFIG_XEN
+OPROFILE-y := xenoprof.o
+else
 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 
-
+endif
 oprofile-y = $(DRIVER_OBJS) $(addprefix ../../i386/oprofile/, $(OPROFILE-y))