* [PATCH] x86/resctrl: Fix init const confusion
@ 2021-04-25 21:12 Andi Kleen
2021-05-06 12:14 ` [tip: x86/urgent] " tip-bot2 for Andi Kleen
0 siblings, 1 reply; 2+ messages in thread
From: Andi Kleen @ 2021-04-25 21:12 UTC (permalink / raw)
To: x86; +Cc: linux-kernel, Andi Kleen, Fenghua Yu
From: Andi Kleen <andi@firstfloor.org>
const variable must be initconst, not initdata.
Cc: Fenghua Yu <fenghua.yu@intel.com>
Signed-off-by: Andi Kleen <andi@firstfloor.org>
---
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 7ac31210e452..4327792a22f2 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)},
--
2.25.4
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [tip: x86/urgent] x86/resctrl: Fix init const confusion
2021-04-25 21:12 [PATCH] x86/resctrl: Fix init const confusion Andi Kleen
@ 2021-05-06 12:14 ` tip-bot2 for Andi Kleen
0 siblings, 0 replies; 2+ messages in thread
From: tip-bot2 for Andi Kleen @ 2021-05-06 12:14 UTC (permalink / raw)
To: linux-tip-commits; +Cc: Andi Kleen, Thomas Gleixner, x86, linux-kernel
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@firstfloor.org>
AuthorDate: Sun, 25 Apr 2021 14:12:29 -07:00
Committer: Thomas Gleixner <tglx@linutronix.de>
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@firstfloor.org>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Link: https://lore.kernel.org/r/20210425211229.3157674-1-ak@linux.intel.com
---
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)},
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-05-06 12:14 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-04-25 21:12 [PATCH] x86/resctrl: Fix init const confusion Andi Kleen
2021-05-06 12:14 ` [tip: x86/urgent] " tip-bot2 for Andi Kleen
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).