From: Mark Rutland Date: Tue, 26 May 2015 16:23:39 +0000 (+0100) Subject: arm: perf: unify perf_event{,_cpu}.c X-Git-Tag: omap-for-v4.3/legacy-v2-signed~129^2~3^2^2 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=74cf0bc75f1671b8da3b2e6ef7b2dc75cab0016a;p=pandora-kernel.git 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 [will: fixed up irq cfg to match upstream] Signed-off-by: Will Deacon --- Reading git-diff-tree failed