diff options
| author | Mark Rutland <mark.rutland@arm.com> | 2015-05-26 17:23:39 +0100 |
|---|---|---|
| committer | Will Deacon <will.deacon@arm.com> | 2015-05-28 17:13:26 +0100 |
| commit | 74cf0bc75f1671b8da3b2e6ef7b2dc75cab0016a (patch) | |
| tree | 1a4d0de76bd5e807834fc2d6b3030b29e7264883 /arch/arm/kernel/Makefile | |
| parent | 29ba0f37f1578db268ac805c117365923b9a7663 (diff) | |
| download | linux-74cf0bc75f1671b8da3b2e6ef7b2dc75cab0016a.tar.bz2 | |
arm: perf: unify perf_event{,_cpu}.c
Now that the arm_pmu framework is only used for CPU PMUs, there's no
reason to keep the pseudo-generic and CPU-specific framework portions
separate.
This patch folds the two into perf_event.c.
Signed-off-by: Mark Rutland <mark.rutland@arm.com>
[will: fixed up irq cfg to match upstream]
Signed-off-by: Will Deacon <will.deacon@arm.com>
Diffstat (limited to 'arch/arm/kernel/Makefile')
| -rw-r--r-- | arch/arm/kernel/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/kernel/Makefile b/arch/arm/kernel/Makefile index 26de3782bd74..d274a1f11f7e 100644 --- a/arch/arm/kernel/Makefile +++ b/arch/arm/kernel/Makefile @@ -70,7 +70,7 @@ obj-$(CONFIG_CPU_PJ4) += pj4-cp0.o obj-$(CONFIG_CPU_PJ4B) += pj4-cp0.o obj-$(CONFIG_IWMMXT) += iwmmxt.o obj-$(CONFIG_PERF_EVENTS) += perf_regs.o perf_callchain.o -obj-$(CONFIG_HW_PERF_EVENTS) += perf_event.o perf_event_cpu.o \ +obj-$(CONFIG_HW_PERF_EVENTS) += perf_event.o \ perf_event_xscale.o perf_event_v6.o \ perf_event_v7.o CFLAGS_pj4-cp0.o := -marm |