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

Commit b558bc0a authored by Sheng Yang's avatar Sheng Yang Committed by Avi Kivity
Browse files

x86: Rename mtrr_state struct and macro names 



Prepare for exporting them.

Signed-off-by: default avatarSheng Yang <sheng@linux.intel.com>
Signed-off-by: default avatarAvi Kivity <avi@redhat.com>
parent 5f179287

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

+4 −4
Original line number Diff line number Diff line
@@ -14,9 +14,9 @@ 
#include <asm/pat.h>

#include "mtrr.h"



struct mtrr_state {

	struct mtrr_var_range var_ranges[MAX_VAR_RANGES];

	mtrr_type fixed_ranges[NUM_FIXED_RANGES];

struct mtrr_state_type {

	struct mtrr_var_range var_ranges[MTRR_MAX_VAR_RANGES];

	mtrr_type fixed_ranges[MTRR_NUM_FIXED_RANGES];

	unsigned char enabled;

	unsigned char have_fixed;

	mtrr_type def_type;
@@ -35,7 +35,7 @@ static struct fixed_range_block fixed_range_blocks[] = { 
};



static unsigned long smp_changes_mask;

static struct mtrr_state mtrr_state = {};

static struct mtrr_state_type mtrr_state = {};

static int mtrr_state_set;

u64 mtrr_tom2;

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

+2 −2
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ 


u32 num_var_ranges = 0;



unsigned int mtrr_usage_table[MAX_VAR_RANGES];

unsigned int mtrr_usage_table[MTRR_MAX_VAR_RANGES];

static DEFINE_MUTEX(mtrr_mutex);



u64 size_or_mask, size_and_mask;
@@ -574,7 +574,7 @@ struct mtrr_value { 
	unsigned long	lsize;

};



static struct mtrr_value mtrr_state[MAX_VAR_RANGES];

static struct mtrr_value mtrr_state[MTRR_MAX_VAR_RANGES];



static int mtrr_save(struct sys_device * sysdev, pm_message_t state)

{

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

+4 −3
Original line number Diff line number Diff line
@@ -11,8 +11,9 @@ 
#define MTRRphysBase_MSR(reg) (0x200 + 2 * (reg))

#define MTRRphysMask_MSR(reg) (0x200 + 2 * (reg) + 1)



#define NUM_FIXED_RANGES 88

#define MAX_VAR_RANGES 256

#define MTRR_NUM_FIXED_RANGES 88

#define MTRR_MAX_VAR_RANGES 256



#define MTRRfix64K_00000_MSR 0x250

#define MTRRfix16K_80000_MSR 0x258

#define MTRRfix16K_A0000_MSR 0x259
@@ -33,7 +34,7 @@ 
   an 8 bit field: */

typedef u8 mtrr_type;



extern unsigned int mtrr_usage_table[MAX_VAR_RANGES];

extern unsigned int mtrr_usage_table[MTRR_MAX_VAR_RANGES];



struct mtrr_ops {

	u32	vendor;