[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <1359135967-31401-1-git-send-email-bp@alien8.de>
Date: Fri, 25 Jan 2013 18:46:07 +0100
From: Borislav Petkov <bp@...en8.de>
To: Ingo Molnar <mingo@...hat.com>
Cc: LKML <linux-kernel@...r.kernel.org>, Borislav Petkov <bp@...e.de>,
Andi Kleen <ak@...ux.intel.com>,
Stephane Eranian <eranian@...gle.com>
Subject: [PATCH] x86, perf_event: Fix build warning
From: Borislav Petkov <bp@...e.de>
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 <bp@...e.de>
Cc: Andi Kleen <ak@...ux.intel.com>
Cc: Stephane Eranian <eranian@...gle.com>
---
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 1e2519d0dc7a..c6ef37af76b0 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))
--
1.8.1.rc3
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists