Commit 2c15679e authored by Juergen Gross's avatar Juergen Gross Committed by Borislav Petkov
Browse files

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: default avatarJuergen Gross <jgross@suse.com>
Signed-off-by: default avatarBorislav Petkov <bp@suse.de>
Link: https://lore.kernel.org/r/20221102074713.21493-11-jgross@suse.com


Signed-off-by: default avatarBorislav Petkov <bp@suse.de>
parent 74069135

arch/x86/kernel/cpu/mtrr/mtrr.c

+5 −8
Original line number Diff line number Diff line
@@ -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;

			}

		}

	}