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

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

x86, mtrr: replace MTRRfix16K_80000_MSR with msr-index's MSR_MTRRfix16K_80000 



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 a036c7a3

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

+2 −2
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ struct fixed_range_block { 


static struct fixed_range_block fixed_range_blocks[] = {

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

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

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

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

	{}

};
@@ -197,7 +197,7 @@ get_fixed_ranges(mtrr_type * frs) 
	rdmsr(MSR_MTRRfix64K_00000, p[0], p[1]);



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

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

		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]);

}

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

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


#define MTRRdefType_MSR 0x2ff



#define MTRRfix16K_80000_MSR 0x258

#define MTRRfix16K_A0000_MSR 0x259

#define MTRRfix4K_C0000_MSR 0x268

#define MTRRfix4K_C8000_MSR 0x269