git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
arch
/
i386
/
kernel
/
cpu
/
mtrr
/
mtrr.h
diff --git
a/arch/i386/kernel/cpu/mtrr/mtrr.h
b/arch/i386/kernel/cpu/mtrr/mtrr.h
index
99c9f26
..
d61ea9d
100644
(file)
--- a/
arch/i386/kernel/cpu/mtrr/mtrr.h
+++ b/
arch/i386/kernel/cpu/mtrr/mtrr.h
@@
-43,15
+43,16
@@
struct mtrr_ops {
void (*set_all)(void);
void (*get)(unsigned int reg, unsigned long *base,
void (*set_all)(void);
void (*get)(unsigned int reg, unsigned long *base,
- unsigned
int
*size, mtrr_type * type);
- int (*get_free_region)
(unsigned long base, unsigned long size);
-
+ 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,
unsigned int type);
int (*have_wrcomb)(void);
};
int (*validate_add_page)(unsigned long base, unsigned long size,
unsigned int type);
int (*have_wrcomb)(void);
};
-extern int generic_get_free_region(unsigned long base, unsigned long size);
+extern int generic_get_free_region(unsigned long base, unsigned long size,
+ int replace_reg);
extern int generic_validate_add_page(unsigned long base, unsigned long size,
unsigned int type);
extern int generic_validate_add_page(unsigned long base, unsigned long size,
unsigned int type);
@@
-62,17
+63,17
@@
extern int positive_have_wrcomb(void);
/* library functions for processor-specific routines */
struct set_mtrr_context {
unsigned long flags;
/* library functions for processor-specific routines */
struct set_mtrr_context {
unsigned long flags;
- unsigned long deftype_lo;
- unsigned long deftype_hi;
unsigned long cr4val;
unsigned long cr4val;
- unsigned long ccr3;
+ u32 deftype_lo;
+ u32 deftype_hi;
+ u32 ccr3;
};
struct mtrr_var_range {
};
struct mtrr_var_range {
- u
nsigned long
base_lo;
- u
nsigned long
base_hi;
- u
nsigned long
mask_lo;
- u
nsigned long
mask_hi;
+ u
32
base_lo;
+ u
32
base_hi;
+ u
32
mask_lo;
+ u
32
mask_hi;
};
void set_mtrr_done(struct set_mtrr_context *ctxt);
};
void set_mtrr_done(struct set_mtrr_context *ctxt);
@@
-92,6
+93,6
@@
extern struct mtrr_ops * mtrr_if;
extern unsigned int num_var_ranges;
void mtrr_state_warn(void);
extern unsigned int num_var_ranges;
void mtrr_state_warn(void);
-char *mtrr_attrib_to_str(int x);
+c
onst c
har *mtrr_attrib_to_str(int x);
void mtrr_wrmsr(unsigned, unsigned, unsigned);
void mtrr_wrmsr(unsigned, unsigned, unsigned);