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

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

x86, mtrr: replace MTRRfix4K_C0000_MSR with msr-index's MSR_MTRRfix4K_C0000 



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 654ac058

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

+2 −2
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ struct fixed_range_block { 
static struct fixed_range_block fixed_range_blocks[] = {

	{ MSR_MTRRfix64K_00000, 1 }, /* one  64k MTRR  */

	{ MSR_MTRRfix16K_80000, 2 }, /* two  16k MTRRs */

	{ MTRRfix4K_C0000_MSR,  8 }, /* eight 4k MTRRs */

	{ MSR_MTRRfix4K_C0000,  8 }, /* eight 4k MTRRs */

	{}

};
@@ -199,7 +199,7 @@ get_fixed_ranges(mtrr_type * frs) 
	for (i = 0; i < 2; i++)

		rdmsr(MSR_MTRRfix16K_80000 + i, p[2 + i * 2], p[3 + i * 2]);

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

		rdmsr(MTRRfix4K_C0000_MSR + i, p[6 + i * 2], p[7 + i * 2]);

		rdmsr(MSR_MTRRfix4K_C0000 + i, p[6 + i * 2], p[7 + i * 2]);

}



void mtrr_save_fixed_ranges(void *info)

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

+0 −2
Original line number Diff line number Diff line
@@ -7,8 +7,6 @@ 


#define MTRRdefType_MSR 0x2ff



#define MTRRfix4K_C0000_MSR 0x268



#define MTRR_CHANGE_MASK_FIXED     0x01

#define MTRR_CHANGE_MASK_VARIABLE  0x02

#define MTRR_CHANGE_MASK_DEFTYPE   0x04