Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c391c788 authored by Jan Beulich's avatar Jan Beulich Committed by Ingo Molnar
Browse files

x86: Constify a few items 



This in particular re-does the compiler warning fix 9faec5be
("perf/x86: Fix P6 driver section warning"), tightening the
section attributes rather than relaxing them.

Signed-off-by: default avatarJan 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: default avatarIngo Molnar <mingo@kernel.org>
parent f6161aa1

arch/x86/kernel/amd_nb.c

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ const struct pci_device_id amd_nb_misc_ids[] = { 
};

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) },

	{}

};

arch/x86/kernel/cpu/perf_event_knc.c

+2 −2
Original line number Diff line number Diff line
@@ -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_formats_attr[] = { 
	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,

arch/x86/kernel/cpu/perf_event_p6.c

+1 −1
Original line number Diff line number Diff line
@@ -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] =