diff options
| author | Hollis Blanchard <hollisb@us.ibm.com> | 2006-11-29 14:16:36 -0600 |
|---|---|---|
| committer | Hollis Blanchard <hollisb@us.ibm.com> | 2006-11-29 14:16:36 -0600 |
| commit | ab26a6a563a0acb589af87a8e063c0e171d75665 (patch) | |
| tree | 71a432bde5d016e928ab3ad7860fca01312ec787 /linux-2.6-xen-sparse/arch/x86_64/oprofile/Makefile | |
| parent | d3be8a6ca1aa9312cc01e780a2fea56ab8ec12b4 (diff) | |
| parent | 1c804664cf63f0c2e80d0420e52d5f82c3956685 (diff) | |
| download | xen-ab26a6a563a0acb589af87a8e063c0e171d75665.tar.gz xen-ab26a6a563a0acb589af87a8e063c0e171d75665.tar.bz2 xen-ab26a6a563a0acb589af87a8e063c0e171d75665.zip | |
Merge with xen-unstable.hg.
Signed-off-by: Hollis Blanchard <hollisb@us.ibm.com>
Diffstat (limited to 'linux-2.6-xen-sparse/arch/x86_64/oprofile/Makefile')
| -rw-r--r-- | linux-2.6-xen-sparse/arch/x86_64/oprofile/Makefile | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/linux-2.6-xen-sparse/arch/x86_64/oprofile/Makefile b/linux-2.6-xen-sparse/arch/x86_64/oprofile/Makefile index 589a7966e8..cc3b9939b0 100644 --- a/linux-2.6-xen-sparse/arch/x86_64/oprofile/Makefile +++ b/linux-2.6-xen-sparse/arch/x86_64/oprofile/Makefile @@ -12,6 +12,8 @@ DRIVER_OBJS = $(addprefix ../../../drivers/oprofile/, \ timer_int.o ) ifdef CONFIG_XEN +XENOPROF_COMMON_OBJS = $(addprefix ../../../drivers/xen/xenoprof/, \ + xenoprofile.o) OPROFILE-y := xenoprof.o else OPROFILE-y := init.o backtrace.o @@ -19,4 +21,5 @@ 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)) +oprofile-y = $(DRIVER_OBJS) $(XENOPROF_COMMON_OBJS) \ + $(addprefix ../../i386/oprofile/, $(OPROFILE-y)) |