x86, perf_event: Fix build warning
Subsystems (2)
Borislav Petkov
maintainerPATCH 1/1 x86, perf_event: Fix build warning
From: Borislav Petkov <[email protected]>
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]
--- arch/x86/kernel/cpu/perf_event.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/kernel/cpu/perf_event.c +1 -1
@@ -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))
Signature · 1 line
1.8.1.rc3
Quoted 10 lines · Borislav Petkov
From: Borislav Petkov <[email protected]>
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]
Quoted 3 lines
Signed-off-by Borislav Petkov <[email protected]>Cc Andi Kleen <[email protected]>Cc Stephane Eranian <[email protected]>
Quoted 20 lines
--- arch/x86/kernel/cpu/perf_event.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)arch/x86/kernel/cpu/perf_event.c +1
-2@@ -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)) --1.8.1.rc3
[tip:perf/x86] perf/x86: Fix type to address build warning
In reply to Borislav PetkovCommit-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]
--- arch/x86/kernel/cpu/perf_event.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/kernel/cpu/perf_event.c +1 -1
@@ -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))