Commit-ID: fc7d3e64651e4de80262e48a3fb75128fffb8ef3 Gitweb: http://git.kernel.org/tip/fc7d3e64651e4de80262e48a3fb75128fffb8ef3 Author: Borislav Petkov <[email protected]> AuthorDate: Fri, 25 Jan 2013 18:46:07 +0100 Committer: Ingo Molnar <[email protected]> CommitDate: Fri, 25 Jan 2013 19:32:02 +0100
perf/x86: Fix type to address build warning Fix this one: arch/x86/kernel/cpu/perf_event.c: In function ‘init_hw_perf_events’: arch/x86/kernel/cpu/perf_event.c:1508:7: warning: assignment from incompatible pointer type [enabled by default] arch/x86/kernel/cpu/perf_event.c:1510:31: warning: assignment from incompatible pointer type [enabled by default] Signed-off-by: Borislav Petkov <[email protected]> Cc: Andi Kleen <[email protected]> Cc: Stephane Eranian <[email protected]> Link: http://lkml.kernel.org/r/[email protected] Signed-off-by: Ingo Molnar <[email protected]> --- arch/x86/kernel/cpu/perf_event.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/kernel/cpu/perf_event.c b/arch/x86/kernel/cpu/perf_event.c index 1e2519d..c6ef37a 100644 --- a/arch/x86/kernel/cpu/perf_event.c +++ b/arch/x86/kernel/cpu/perf_event.c @@ -1503,7 +1503,7 @@ static int __init init_hw_perf_events(void) filter_events(x86_pmu_events_group.attrs); if (x86_pmu.cpu_events) { - struct attribute *tmp; + struct attribute **tmp; tmp = merge_attr(x86_pmu_events_group.attrs, x86_pmu.cpu_events); if (!WARN_ON(!tmp)) -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
