Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d9bcc01d authored by Jaswinder Singh Rajput's avatar Jaswinder Singh Rajput Committed by H. Peter Anvin
Browse files

x86, mtrr: replace MTRRcap_MSR with msr-index's MSR_MTRRcap 



Use standard msr-index.h's MSR declaration and no need to declare again.

[ Impact: cleanup, no object code change ]

Signed-off-by: default avatarJaswinder Singh Rajput <jaswinderrajput@gmail.com>
Signed-off-by: default avatarH. Peter Anvin <hpa@zytor.com>
parent 778dedae

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

+2 −2
Original line number Diff line number Diff line
@@ -306,7 +306,7 @@ void __init get_mtrr_state(void) 


	vrs = mtrr_state.var_ranges;



	rdmsr(MTRRcap_MSR, lo, dummy);

	rdmsr(MSR_MTRRcap, lo, dummy);

	mtrr_state.have_fixed = (lo >> 8) & 1;



	for (i = 0; i < num_var_ranges; i++)
@@ -703,7 +703,7 @@ int generic_validate_add_page(unsigned long base, unsigned long size, unsigned i 
static int generic_have_wrcomb(void)

{

	unsigned long config, dummy;

	rdmsr(MTRRcap_MSR, config, dummy);

	rdmsr(MSR_MTRRcap, config, dummy);

	return (config & (1 << 10));

}

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

+1 −1
Original line number Diff line number Diff line
@@ -104,7 +104,7 @@ static void __init set_num_var_ranges(void) 
	unsigned long config = 0, dummy;



	if (use_intel()) {

		rdmsr(MTRRcap_MSR, config, dummy);

		rdmsr(MSR_MTRRcap, config, dummy);

	} else if (is_cpu(AMD))

		config = 2;

	else if (is_cpu(CYRIX) || is_cpu(CENTAUR))

arch/x86/kernel/cpu/mtrr/mtrr.h

+0 −1
Original line number Diff line number Diff line
@@ -5,7 +5,6 @@ 
#include <linux/types.h>

#include <linux/stddef.h>



#define MTRRcap_MSR     0x0fe

#define MTRRdefType_MSR 0x2ff



#define MTRRfix64K_00000_MSR 0x250