diff options
| author | yangyongqiang <yangyongqiang01@baidu.com> | 2012-12-18 12:22:25 -0800 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2013-01-24 16:04:56 +0100 |
| commit | 9faec5be3a27f95ee359b42c6c81b3173eb13958 (patch) | |
| tree | 67a7913af8c9b853ef7f9f094fee5916352c6782 /arch/x86 | |
| parent | 55a6e622e66a27ab106fae00cac15ba630e7fbd4 (diff) | |
| download | linux-9faec5be3a27f95ee359b42c6c81b3173eb13958.tar.bz2 | |
perf/x86: Fix P6 driver section warning
Fix a compile warning - 'a section type conflict' by removing
__initconst.
Signed-off-by: yangyongqiang <yangyongqiang01@baidu.com>
Cc: Cyrill Gorcunov <gorcunov@gmail.com>
Cc: Vince Weaver <vincent.weaver@maine.edu>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86')
| -rw-r--r-- | arch/x86/kernel/cpu/perf_event_p6.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/cpu/perf_event_p6.c b/arch/x86/kernel/cpu/perf_event_p6.c index f2af39f5dc3d..4820c232a0b9 100644 --- a/arch/x86/kernel/cpu/perf_event_p6.c +++ b/arch/x86/kernel/cpu/perf_event_p6.c @@ -19,7 +19,7 @@ static const u64 p6_perfmon_event_map[] = }; -static __initconst u64 p6_hw_cache_event_ids +static u64 p6_hw_cache_event_ids [PERF_COUNT_HW_CACHE_MAX] [PERF_COUNT_HW_CACHE_OP_MAX] [PERF_COUNT_HW_CACHE_RESULT_MAX] = |