diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-02-28 10:39:16 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-02-28 10:39:16 -0800 |
| commit | 0091945b4732469bb39bbb4556ce08a25d89d1c2 (patch) | |
| tree | bb6c4fc80995d35f1b4b7088a0f9e92d8f679c4f /arch/x86/kernel/cpu/mtrr/mtrr.h | |
| parent | 46bbffad54bd48bb809f2691c1970a79a588976b (diff) | |
| parent | 40d6753e78a602bdf62e7741c0caa36474882f00 (diff) | |
| download | kernel_samsung_tuna-0091945b4732469bb39bbb4556ce08a25d89d1c2.zip kernel_samsung_tuna-0091945b4732469bb39bbb4556ce08a25d89d1c2.tar.gz kernel_samsung_tuna-0091945b4732469bb39bbb4556ce08a25d89d1c2.tar.bz2 | |
Merge branch 'x86-mtrr-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-mtrr-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86: Convert set_atomicity_lock to raw_spinlock
x86, mtrr: Kill over the top warn
x86, mtrr: Constify struct mtrr_ops
Diffstat (limited to 'arch/x86/kernel/cpu/mtrr/mtrr.h')
| -rw-r--r-- | arch/x86/kernel/cpu/mtrr/mtrr.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/x86/kernel/cpu/mtrr/mtrr.h b/arch/x86/kernel/cpu/mtrr/mtrr.h index a501dee..df5e41f 100644 --- a/arch/x86/kernel/cpu/mtrr/mtrr.h +++ b/arch/x86/kernel/cpu/mtrr/mtrr.h @@ -32,7 +32,7 @@ extern int generic_get_free_region(unsigned long base, unsigned long size, extern int generic_validate_add_page(unsigned long base, unsigned long size, unsigned int type); -extern struct mtrr_ops generic_mtrr_ops; +extern const struct mtrr_ops generic_mtrr_ops; extern int positive_have_wrcomb(void); @@ -53,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(const struct mtrr_ops *ops); extern u64 size_or_mask, size_and_mask; -extern struct mtrr_ops *mtrr_if; +extern const 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) |