2012-10-30 12:25:14

by Peter Huewe

[permalink] [raw]
Subject: [tip:perf/core] perf/x86: Fix sparse warnings

Commit-ID: 95d18aa2b6c05351181934b3bc34ce038cc7b637
Gitweb: http://git.kernel.org/tip/95d18aa2b6c05351181934b3bc34ce038cc7b637
Author: Peter Huewe <[email protected]>
AuthorDate: Mon, 29 Oct 2012 21:48:17 +0100
Committer: Ingo Molnar <[email protected]>
CommitDate: Tue, 30 Oct 2012 10:10:52 +0100

perf/x86: Fix sparse warnings

FYI, there are new sparse warnings:

arch/x86/kernel/cpu/perf_event.c:1356:18: sparse: symbol 'events_attr' was not declared. Should it be static?

This patch makes it static and also adds the static keyword to
fix arch/x86/kernel/cpu/perf_event.c:1344:9: warning: symbol
'events_sysfs_show' was not declared.

Signed-off-by: Peter Huewe <[email protected]>
Cc: Peter Zijlstra <[email protected]>
Cc: Yuanhan Liu <[email protected]>
Cc: [email protected]
Cc: Jiri Olsa <[email protected]>
Link: http://lkml.kernel.org/n/[email protected]
Signed-off-by: Ingo Molnar <[email protected]>
---
arch/x86/kernel/cpu/perf_event.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/x86/kernel/cpu/perf_event.c b/arch/x86/kernel/cpu/perf_event.c
index 0a55ab2..4428fd1 100644
--- a/arch/x86/kernel/cpu/perf_event.c
+++ b/arch/x86/kernel/cpu/perf_event.c
@@ -1341,7 +1341,7 @@ static void __init filter_events(struct attribute **attrs)
}
}

-ssize_t events_sysfs_show(struct device *dev, struct device_attribute *attr,
+static ssize_t events_sysfs_show(struct device *dev, struct device_attribute *attr,
char *page)
{
struct perf_pmu_events_attr *pmu_attr = \
@@ -1373,7 +1373,7 @@ EVENT_ATTR(ref-cycles, REF_CPU_CYCLES );

static struct attribute *empty_attrs;

-struct attribute *events_attr[] = {
+static struct attribute *events_attr[] = {
EVENT_PTR(CPU_CYCLES),
EVENT_PTR(INSTRUCTIONS),
EVENT_PTR(CACHE_REFERENCES),