2008-12-19 17:09:51

by Jaswinder Singh Rajput

Subject: [PATCH] x86: perf_counter.c intel_perfmon_event_map and max_intel_perfmon_events should be static

Impact: cleanup, avoid sparse warnings, reduce kernel size a bit

Fixes these sparse warnings:
arch/x86/kernel/cpu/perf_counter.c:44:11: warning: symbol 'intel_perfmon_event_map' was not declared. Should it be static?
arch/x86/kernel/cpu/perf_counter.c:54:11: warning: symbol 'max_intel_perfmon_events' was not declared. Should it be static?

Signed-off-by: Jaswinder Singh <[email protected]>
---
arch/x86/kernel/cpu/perf_counter.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/x86/kernel/cpu/perf_counter.c b/arch/x86/kernel/cpu/perf_counter.c
index 8a154bd..bdbdb56 100644
--- a/arch/x86/kernel/cpu/perf_counter.c
+++ b/arch/x86/kernel/cpu/perf_counter.c
@@ -41,7 +41,7 @@ struct cpu_hw_counters {
*/
static DEFINE_PER_CPU(struct cpu_hw_counters, cpu_hw_counters);

-const int intel_perfmon_event_map[] =
+static const int intel_perfmon_event_map[] =
{
[PERF_COUNT_CYCLES] = 0x003c,
[PERF_COUNT_INSTRUCTIONS] = 0x00c0,
@@ -51,7 +51,7 @@ const int intel_perfmon_event_map[] =
[PERF_COUNT_BRANCH_MISSES] = 0x00c5,
};

-const int max_intel_perfmon_events = ARRAY_SIZE(intel_perfmon_event_map);
+static const int max_intel_perfmon_events = ARRAY_SIZE(intel_perfmon_event_map);

/*
* Propagate counter elapsed time into the generic counter.
--
1.5.5.1

2008-12-19 22:15:51

by Ingo Molnar

Subject: Re: [PATCH] x86: perf_counter.c intel_perfmon_event_map and max_intel_perfmon_events should be static

* Jaswinder Singh <[email protected]> wrote:

> Impact: cleanup, avoid sparse warnings, reduce kernel size a bit
>
> Fixes these sparse warnings:
> arch/x86/kernel/cpu/perf_counter.c:44:11: warning: symbol 'intel_perfmon_event_map' was not declared. Should it be static?
> arch/x86/kernel/cpu/perf_counter.c:54:11: warning: symbol 'max_intel_perfmon_events' was not declared. Should it be static?
>
> Signed-off-by: Jaswinder Singh <[email protected]>
> ---
> arch/x86/kernel/cpu/perf_counter.c | 4 ++--
> 1 files changed, 2 insertions(+), 2 deletions(-)

applied to tip/perfcounters/core, thanks!

Ingo