arm: perf: unify perf_event{,_cpu}.c
authorMark Rutland <mark.rutland@arm.com>
Tue, 26 May 2015 16:23:39 +0000 (17:23 +0100)
committerWill Deacon <will.deacon@arm.com>
Thu, 28 May 2015 16:13:26 +0000 (17:13 +0100)
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>
arch/arm/kernel/Makefile
arch/arm/kernel/perf_event.c
arch/arm/kernel/perf_event_cpu.c [deleted file]

Simple merge
Simple merge
diff --cc arch/arm/kernel/perf_event_cpu.c
Simple merge