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/cyrix.c | |
| parent | 46bbffad54bd48bb809f2691c1970a79a588976b (diff) | |
| parent | 40d6753e78a602bdf62e7741c0caa36474882f00 (diff) | |
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/cyrix.c')
| -rw-r--r-- | arch/x86/kernel/cpu/mtrr/cyrix.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/cpu/mtrr/cyrix.c b/arch/x86/kernel/cpu/mtrr/cyrix.c index 228d982ce09..68a3343e579 100644 --- a/arch/x86/kernel/cpu/mtrr/cyrix.c +++ b/arch/x86/kernel/cpu/mtrr/cyrix.c @@ -265,7 +265,7 @@ static void cyrix_set_all(void) post_set(); } -static struct mtrr_ops cyrix_mtrr_ops = { +static const struct mtrr_ops cyrix_mtrr_ops = { .vendor = X86_VENDOR_CYRIX, .set_all = cyrix_set_all, .set = cyrix_set_arr, |