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 <jbeul...@suse.com>
Cc: Shaun Ruffell <sruff...@digium.com>
Cc: yangyongqiang <yangyongqian...@baidu.com>
Cc: Cyrill Gorcunov <gorcu...@gmail.com>
Cc: Vince Weaver <vincent.wea...@maine.edu>
---
arch/x86/kernel/amd_nb.c | 2 +-
arch/x86/kernel/cpu/perf_event_knc.c | 4 ++--
arch/x86/kernel/cpu/perf_event_p6.c | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
--- 3.9-rc2/arch/x86/kernel/amd_nb.c
+++ 3.9-rc2-x86-const-sections/arch/x86/kernel/amd_nb.c
@@ -24,7 +24,7 @@ const struct pci_device_id amd_nb_misc_i
};
EXPORT_SYMBOL(amd_nb_misc_ids);
-static struct pci_device_id amd_nb_link_ids[] = {
+static const struct pci_device_id amd_nb_link_ids[] = {
{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_15H_NB_F4) },
{}
};
--- 3.9-rc2/arch/x86/kernel/cpu/perf_event_knc.c
+++ 3.9-rc2-x86-const-sections/arch/x86/kernel/cpu/perf_event_knc.c
@@ -17,7 +17,7 @@ static const u64 knc_perfmon_event_map[]
[PERF_COUNT_HW_BRANCH_MISSES] = 0x002b,
};
-static __initconst u64 knc_hw_cache_event_ids
+static const u64 __initconst knc_hw_cache_event_ids
[PERF_COUNT_HW_CACHE_MAX]
[PERF_COUNT_HW_CACHE_OP_MAX]
[PERF_COUNT_HW_CACHE_RESULT_MAX] =
@@ -284,7 +284,7 @@ static struct attribute *intel_knc_forma
NULL,
};
-static __initconst struct x86_pmu knc_pmu = {
+static const struct x86_pmu knc_pmu __initconst = {
.name = "knc",
.handle_irq = knc_pmu_handle_irq,
.disable_all = knc_pmu_disable_all,
--- 3.9-rc2/arch/x86/kernel/cpu/perf_event_p6.c
+++ 3.9-rc2-x86-const-sections/arch/x86/kernel/cpu/perf_event_p6.c
@@ -19,7 +19,7 @@ static const u64 p6_perfmon_event_map[]
};
-static u64 p6_hw_cache_event_ids
+static const u64 __initconst p6_hw_cache_event_ids
[PERF_COUNT_HW_CACHE_MAX]
[PERF_COUNT_HW_CACHE_OP_MAX]
[PERF_COUNT_HW_CACHE_RESULT_MAX] =
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
