The following commit has been merged into the x86/cpu branch of tip:
Commit-ID: 2c15679e8687d5934e1a70fe50ce409bb8a2aba1
Gitweb: https://git.kernel.org/tip/2c15679e8687d5934e1a70fe50ce409bb8a2aba1
Author: Juergen Gross <jgross@xxxxxxxx>
AuthorDate: Wed, 02 Nov 2022 08:47:07 +01:00
Committer: Borislav Petkov <bp@xxxxxxx>
CommitterDate: Thu, 10 Nov 2022 13:12:45 +01:00
x86/mtrr: Get rid of __mtrr_enabled bool
There is no need for keeping __mtrr_enabled as it can easily be replaced
by testing mtrr_if to be not NULL.
Signed-off-by: Juergen Gross <jgross@xxxxxxxx>
Signed-off-by: Borislav Petkov <bp@xxxxxxx>
Link: https://lore.kernel.org/r/20221102074713.21493-11-jgross@xxxxxxxx
Signed-off-by: Borislav Petkov <bp@xxxxxxx>
---
arch/x86/kernel/cpu/mtrr/mtrr.c | 13 +++++--------
1 file changed, 5 insertions(+), 8 deletions(-)
diff --git a/arch/x86/kernel/cpu/mtrr/mtrr.c b/arch/x86/kernel/cpu/mtrr/mtrr.c
index a468be5..f671be9 100644
--- a/arch/x86/kernel/cpu/mtrr/mtrr.c
+++ b/arch/x86/kernel/cpu/mtrr/mtrr.c
@@ -59,11 +59,9 @@
#define MTRR_TO_PHYS_WC_OFFSET 1000
u32 num_var_ranges;
-static bool __mtrr_enabled;
-
static bool mtrr_enabled(void)
{
- return __mtrr_enabled;
+ return !!mtrr_if;
}
unsigned int mtrr_usage_table[MTRR_MAX_VAR_RANGES];
@@ -755,18 +753,17 @@ void __init mtrr_bp_init(void)
}
}
- if (mtrr_if) {
- __mtrr_enabled = true;
+ if (mtrr_enabled()) {
set_num_var_ranges(mtrr_if == &generic_mtrr_ops);
init_table();
if (mtrr_if == &generic_mtrr_ops) {
/* BIOS may override */
- __mtrr_enabled = get_mtrr_state();
-
- if (mtrr_enabled()) {
+ if (get_mtrr_state()) {
memory_caching_control |= CACHE_MTRR | CACHE_PAT;
changed_by_mtrr_cleanup = mtrr_cleanup(phys_addr);
cache_cpu_init();
+ } else {
+ mtrr_if = NULL;
}
}
}
|