diff options
author | Peter Zijlstra <a.p.zijlstra@chello.nl> | 2010-03-29 07:09:53 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2010-04-02 13:52:05 -0400 |
commit | caaa8be3b6707cb9664e573a28b00f845ce9f32e (patch) | |
tree | c6cc712c547262e74cc56168248c8da121736ecd /arch/x86/kernel/cpu/perf_event_p4.c | |
parent | b4cdc5c264b35c67007800dec3928e9547a9d70b (diff) |
perf, x86: Fix __initconst vs const
All variables that have __initconst should also be const.
Suggested-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
LKML-Reference: <new-submission>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel/cpu/perf_event_p4.c')
-rw-r--r-- | arch/x86/kernel/cpu/perf_event_p4.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/kernel/cpu/perf_event_p4.c b/arch/x86/kernel/cpu/perf_event_p4.c index acd237d29f1..15367cce66b 100644 --- a/arch/x86/kernel/cpu/perf_event_p4.c +++ b/arch/x86/kernel/cpu/perf_event_p4.c | |||
@@ -287,7 +287,7 @@ static struct p4_event_bind p4_event_bind_map[] = { | |||
287 | p4_config_pack_cccr(cache_event | \ | 287 | p4_config_pack_cccr(cache_event | \ |
288 | P4_CCCR_ESEL(P4_OPCODE_ESEL(P4_OPCODE(event)))) | 288 | P4_CCCR_ESEL(P4_OPCODE_ESEL(P4_OPCODE(event)))) |
289 | 289 | ||
290 | static __initconst u64 p4_hw_cache_event_ids | 290 | static __initconst const u64 p4_hw_cache_event_ids |
291 | [PERF_COUNT_HW_CACHE_MAX] | 291 | [PERF_COUNT_HW_CACHE_MAX] |
292 | [PERF_COUNT_HW_CACHE_OP_MAX] | 292 | [PERF_COUNT_HW_CACHE_OP_MAX] |
293 | [PERF_COUNT_HW_CACHE_RESULT_MAX] = | 293 | [PERF_COUNT_HW_CACHE_RESULT_MAX] = |
@@ -780,7 +780,7 @@ done: | |||
780 | return num ? -ENOSPC : 0; | 780 | return num ? -ENOSPC : 0; |
781 | } | 781 | } |
782 | 782 | ||
783 | static __initconst struct x86_pmu p4_pmu = { | 783 | static __initconst const struct x86_pmu p4_pmu = { |
784 | .name = "Netburst P4/Xeon", | 784 | .name = "Netburst P4/Xeon", |
785 | .handle_irq = p4_pmu_handle_irq, | 785 | .handle_irq = p4_pmu_handle_irq, |
786 | .disable_all = p4_pmu_disable_all, | 786 | .disable_all = p4_pmu_disable_all, |