Commit 08611a3a authored by Juergen Gross's avatar Juergen Gross Committed by Borislav Petkov (AMD)
Browse files

x86/mtrr: Remove unused code 



mtrr_centaur_report_mcr() isn't used by anyone, so it can be removed.

Signed-off-by: default avatarJuergen Gross <jgross@suse.com>
Signed-off-by: default avatarBorislav Petkov (AMD) <bp@alien8.de>
Tested-by: default avatarMichael Kelley <mikelley@microsoft.com>
Link: https://lore.kernel.org/r/20230502120931.20719-17-jgross@suse.com


Signed-off-by: default avatarBorislav Petkov (AMD) <bp@alien8.de>
parent 12f0dd8d

arch/x86/include/asm/mtrr.h

+0 −4
Original line number Diff line number Diff line
@@ -69,7 +69,6 @@ extern int mtrr_add_page(unsigned long base, unsigned long size, 
			 unsigned int type, bool increment);

extern int mtrr_del(int reg, unsigned long base, unsigned long size);

extern int mtrr_del_page(int reg, unsigned long base, unsigned long size);

extern void mtrr_centaur_report_mcr(int mcr, u32 lo, u32 hi);

extern void mtrr_bp_restore(void);

extern int mtrr_trim_uncached_memory(unsigned long end_pfn);

extern int amd_special_default_mtrr(void);
@@ -117,9 +116,6 @@ static inline int mtrr_trim_uncached_memory(unsigned long end_pfn) 
{

	return 0;

}

static inline void mtrr_centaur_report_mcr(int mcr, u32 lo, u32 hi)

{

}

#define mtrr_bp_init() do {} while (0)

#define mtrr_bp_restore() do {} while (0)

#define mtrr_disable() do {} while (0)

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

+0 −9
Original line number Diff line number Diff line
@@ -45,15 +45,6 @@ centaur_get_free_region(unsigned long base, unsigned long size, int replace_reg) 
	return -ENOSPC;

}



/*

 * Report boot time MCR setups

 */

void mtrr_centaur_report_mcr(int mcr, u32 lo, u32 hi)

{

	centaur_mcr[mcr].low = lo;

	centaur_mcr[mcr].high = hi;

}



static void

centaur_get_mcr(unsigned int reg, unsigned long *base,

		unsigned long *size, mtrr_type * type)