diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-11-15 11:05:18 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-11-15 11:05:18 +0100 |
| commit | c23205c8488f11cb9ebe7a7b5851a1d8a0171011 (patch) | |
| tree | 239dd82daddb1ce08b50ea9145d8f2a4685ebead /arch/x86/oprofile/Makefile | |
| parent | 5d81e5cfb37a174e8ddc0413e2e70cdf05807ace (diff) | |
| parent | de346b6949063aa040ef607943b072835294f4b3 (diff) | |
Merge branch 'core' of git://amd64.org/linux/rric into perf/core
Diffstat (limited to 'arch/x86/oprofile/Makefile')
| -rw-r--r-- | arch/x86/oprofile/Makefile | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/x86/oprofile/Makefile b/arch/x86/oprofile/Makefile index 446902b2a6b6..1599f568f0e2 100644 --- a/arch/x86/oprofile/Makefile +++ b/arch/x86/oprofile/Makefile @@ -4,9 +4,8 @@ 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 ) + timer_int.o nmi_timer_int.o ) oprofile-y := $(DRIVER_OBJS) init.o backtrace.o oprofile-$(CONFIG_X86_LOCAL_APIC) += nmi_int.o op_model_amd.o \ op_model_ppro.o op_model_p4.o -oprofile-$(CONFIG_X86_IO_APIC) += nmi_timer_int.o |