The following commit has been merged into the x86/urgent branch of tip: Commit-ID: 4029b9706d53e5e8db2e1cee6ecd75e60b62cd09 Gitweb: https://git.kernel.org/tip/4029b9706d53e5e8db2e1cee6ecd75e60b62cd09 Author: Andi Kleen <andi@xxxxxxxxxxxxxx> AuthorDate: Sun, 25 Apr 2021 14:12:29 -07:00 Committer: Thomas Gleixner <tglx@xxxxxxxxxxxxx> CommitterDate: Wed, 05 May 2021 21:50:14 +02:00 x86/resctrl: Fix init const confusion const variable must be initconst, not initdata. Signed-off-by: Andi Kleen <andi@xxxxxxxxxxxxxx> Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx> Link: https://lore.kernel.org/r/20210425211229.3157674-1-ak@xxxxxxxxxxxxxxx --- arch/x86/kernel/cpu/resctrl/monitor.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/kernel/cpu/resctrl/monitor.c b/arch/x86/kernel/cpu/resctrl/monitor.c index dbeaa84..f07c10b 100644 --- a/arch/x86/kernel/cpu/resctrl/monitor.c +++ b/arch/x86/kernel/cpu/resctrl/monitor.c @@ -84,7 +84,7 @@ unsigned int resctrl_cqm_threshold; static const struct mbm_correction_factor_table { u32 rmidthreshold; u64 cf; -} mbm_cf_table[] __initdata = { +} mbm_cf_table[] __initconst = { {7, CF(1.000000)}, {15, CF(1.000000)}, {15, CF(0.969650)},