Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 158672
b: refs/heads/master
c: 3ec8dbc
h: refs/heads/master
v: v3
  • Loading branch information
Jaswinder Singh Rajput authored and Ingo Molnar committed Jul 4, 2009
1 parent fb22f8c commit 229b59f
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 11 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 26dc67eda19beafb7e5ef2770cec5b3ee5995a8e
refs/heads/master: 3ec8dbcb09bb6df83993ca03e88cb85e3aaa8edb
19 changes: 9 additions & 10 deletions trunk/arch/x86/kernel/cpu/mtrr/mtrr.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* local mtrr defines.
* local MTRR defines.
*/

#include <linux/types.h>
Expand All @@ -14,13 +14,12 @@ extern unsigned int mtrr_usage_table[MTRR_MAX_VAR_RANGES];
struct mtrr_ops {
u32 vendor;
u32 use_intel_if;
// void (*init)(void);
void (*set)(unsigned int reg, unsigned long base,
unsigned long size, mtrr_type type);
void (*set_all)(void);

void (*get)(unsigned int reg, unsigned long *base,
unsigned long *size, mtrr_type * type);
unsigned long *size, mtrr_type *type);
int (*get_free_region)(unsigned long base, unsigned long size,
int replace_reg);
int (*validate_add_page)(unsigned long base, unsigned long size,
Expand All @@ -39,11 +38,11 @@ extern int positive_have_wrcomb(void);

/* library functions for processor-specific routines */
struct set_mtrr_context {
unsigned long flags;
unsigned long cr4val;
u32 deftype_lo;
u32 deftype_hi;
u32 ccr3;
unsigned long flags;
unsigned long cr4val;
u32 deftype_lo;
u32 deftype_hi;
u32 ccr3;
};

void set_mtrr_done(struct set_mtrr_context *ctxt);
Expand All @@ -54,10 +53,10 @@ void fill_mtrr_var_range(unsigned int index,
u32 base_lo, u32 base_hi, u32 mask_lo, u32 mask_hi);
void get_mtrr_state(void);

extern void set_mtrr_ops(struct mtrr_ops * ops);
extern void set_mtrr_ops(struct mtrr_ops *ops);

extern u64 size_or_mask, size_and_mask;
extern struct mtrr_ops * mtrr_if;
extern struct mtrr_ops *mtrr_if;

#define is_cpu(vnd) (mtrr_if && mtrr_if->vendor == X86_VENDOR_##vnd)
#define use_intel() (mtrr_if && mtrr_if->use_intel_if == 1)
Expand Down

0 comments on commit 229b59f

Please sign in to comment.