Commit 04ba8747 authored by Juergen Gross's avatar Juergen Gross Committed by Borislav Petkov
Browse files

x86/mtrr: Remove unused cyrix_set_all() function 



The Cyrix CPU specific MTRR function cyrix_set_all() will never be
called as the mtrr_ops->set_all() callback will only be called in the
use_intel() case, which would require the use_intel_if member of struct
mtrr_ops to be set, which isn't the case for Cyrix.

Signed-off-by: default avatarJuergen Gross <jgross@suse.com>
Signed-off-by: default avatarBorislav Petkov <bp@suse.de>
Link: https://lore.kernel.org/r/20221004081023.32402-3-jgross@suse.com
parent 01c97c73

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

+0 −34
Original line number Diff line number Diff line
@@ -234,42 +234,8 @@ static void cyrix_set_arr(unsigned int reg, unsigned long base, 
	post_set();

}



typedef struct {

	unsigned long	base;

	unsigned long	size;

	mtrr_type	type;

} arr_state_t;



static arr_state_t arr_state[8] = {

	{0UL, 0UL, 0UL}, {0UL, 0UL, 0UL}, {0UL, 0UL, 0UL}, {0UL, 0UL, 0UL},

	{0UL, 0UL, 0UL}, {0UL, 0UL, 0UL}, {0UL, 0UL, 0UL}, {0UL, 0UL, 0UL}

};



static unsigned char ccr_state[7] = { 0, 0, 0, 0, 0, 0, 0 };



static void cyrix_set_all(void)

{

	int i;



	prepare_set();



	/* the CCRs are not contiguous */

	for (i = 0; i < 4; i++)

		setCx86(CX86_CCR0 + i, ccr_state[i]);

	for (; i < 7; i++)

		setCx86(CX86_CCR4 + i, ccr_state[i]);



	for (i = 0; i < 8; i++) {

		cyrix_set_arr(i, arr_state[i].base,

			      arr_state[i].size, arr_state[i].type);

	}



	post_set();

}



static const struct mtrr_ops cyrix_mtrr_ops = {

	.vendor            = X86_VENDOR_CYRIX,

	.set_all	   = cyrix_set_all,

	.set               = cyrix_set_arr,

	.get               = cyrix_get_arr,

	.get_free_region   = cyrix_get_free_region,