diff options
author | Jan Beulich <JBeulich@suse.com> | 2013-03-11 05:56:05 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2013-03-11 10:11:03 -0400 |
commit | c391c7884633cdc317a60fbf152d1764282fe633 (patch) | |
tree | 58f01fa3ff5ce4c024527c3e7c2e0ba237c518ab /arch/x86 | |
parent | f6161aa153581da4a3867a2d1a7caf4be19b6ec9 (diff) |
x86: Constify a few items
This in particular re-does the compiler warning fix 9faec5b
("perf/x86: Fix P6 driver section warning"), tightening the
section attributes rather than relaxing them.
Signed-off-by: Jan Beulich <jbeulich@suse.com>
Cc: Shaun Ruffell <sruffell@digium.com>
Cc: yangyongqiang <yangyongqiang01@baidu.com>
Cc: Cyrill Gorcunov <gorcunov@gmail.com>
Cc: Vince Weaver <vincent.weaver@maine.edu>
Link: http://lkml.kernel.org/r/513DB84502000078000C4880@nat28.tlf.novell.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86')
-rw-r--r-- | arch/x86/kernel/amd_nb.c | 2 | ||||
-rw-r--r-- | arch/x86/kernel/cpu/perf_event_knc.c | 4 | ||||
-rw-r--r-- | arch/x86/kernel/cpu/perf_event_p6.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/arch/x86/kernel/amd_nb.c b/arch/x86/kernel/amd_nb.c index aadf3359e2a7..3684129be947 100644 --- a/arch/x86/kernel/amd_nb.c +++ b/arch/x86/kernel/amd_nb.c | |||
@@ -24,7 +24,7 @@ const struct pci_device_id amd_nb_misc_ids[] = { | |||
24 | }; | 24 | }; |
25 | EXPORT_SYMBOL(amd_nb_misc_ids); | 25 | EXPORT_SYMBOL(amd_nb_misc_ids); |
26 | 26 | ||
27 | static struct pci_device_id amd_nb_link_ids[] = { | 27 | static const struct pci_device_id amd_nb_link_ids[] = { |
28 | { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_15H_NB_F4) }, | 28 | { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_15H_NB_F4) }, |
29 | {} | 29 | {} |
30 | }; | 30 | }; |
diff --git a/arch/x86/kernel/cpu/perf_event_knc.c b/arch/x86/kernel/cpu/perf_event_knc.c index 4b7731bf23a8..838fa8772c62 100644 --- a/arch/x86/kernel/cpu/perf_event_knc.c +++ b/arch/x86/kernel/cpu/perf_event_knc.c | |||
@@ -17,7 +17,7 @@ static const u64 knc_perfmon_event_map[] = | |||
17 | [PERF_COUNT_HW_BRANCH_MISSES] = 0x002b, | 17 | [PERF_COUNT_HW_BRANCH_MISSES] = 0x002b, |
18 | }; | 18 | }; |
19 | 19 | ||
20 | static __initconst u64 knc_hw_cache_event_ids | 20 | static const u64 __initconst knc_hw_cache_event_ids |
21 | [PERF_COUNT_HW_CACHE_MAX] | 21 | [PERF_COUNT_HW_CACHE_MAX] |
22 | [PERF_COUNT_HW_CACHE_OP_MAX] | 22 | [PERF_COUNT_HW_CACHE_OP_MAX] |
23 | [PERF_COUNT_HW_CACHE_RESULT_MAX] = | 23 | [PERF_COUNT_HW_CACHE_RESULT_MAX] = |
@@ -284,7 +284,7 @@ static struct attribute *intel_knc_formats_attr[] = { | |||
284 | NULL, | 284 | NULL, |
285 | }; | 285 | }; |
286 | 286 | ||
287 | static __initconst struct x86_pmu knc_pmu = { | 287 | static const struct x86_pmu knc_pmu __initconst = { |
288 | .name = "knc", | 288 | .name = "knc", |
289 | .handle_irq = knc_pmu_handle_irq, | 289 | .handle_irq = knc_pmu_handle_irq, |
290 | .disable_all = knc_pmu_disable_all, | 290 | .disable_all = knc_pmu_disable_all, |
diff --git a/arch/x86/kernel/cpu/perf_event_p6.c b/arch/x86/kernel/cpu/perf_event_p6.c index 4820c232a0b9..b1e2fe115323 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[] = | |||
19 | 19 | ||
20 | }; | 20 | }; |
21 | 21 | ||
22 | static u64 p6_hw_cache_event_ids | 22 | static const u64 __initconst p6_hw_cache_event_ids |
23 | [PERF_COUNT_HW_CACHE_MAX] | 23 | [PERF_COUNT_HW_CACHE_MAX] |
24 | [PERF_COUNT_HW_CACHE_OP_MAX] | 24 | [PERF_COUNT_HW_CACHE_OP_MAX] |
25 | [PERF_COUNT_HW_CACHE_RESULT_MAX] = | 25 | [PERF_COUNT_HW_CACHE_RESULT_MAX] = |