diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-13 14:32:09 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-13 14:32:09 -0400 |
| commit | b8256b45d1245ad16221e8f965241267bd26c79d (patch) | |
| tree | 88a72ca74e658322496f398fa579d51d10c69055 /arch/x86/mm/pat.c | |
| parent | 8255309b887fcac11f791913a2d1d0b966a40d32 (diff) | |
| parent | a30469e7921a6dd2067e9e836d7787cfa0105627 (diff) | |
Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86: add linux kernel support for YMM state
x86: fix wrong section of pat_disable & make it static
x86: Fix section mismatches in mpparse
x86: fix set_fixmap to use phys_addr_t
x86: Document get_user_pages_fast()
x86, intr-remap: fix eoi for interrupt remapping without x2apic
Diffstat (limited to 'arch/x86/mm/pat.c')
| -rw-r--r-- | arch/x86/mm/pat.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/mm/pat.c b/arch/x86/mm/pat.c index 640339ee4fb2..c009a241d562 100644 --- a/arch/x86/mm/pat.c +++ b/arch/x86/mm/pat.c | |||
| @@ -31,7 +31,7 @@ | |||
| 31 | #ifdef CONFIG_X86_PAT | 31 | #ifdef CONFIG_X86_PAT |
| 32 | int __read_mostly pat_enabled = 1; | 32 | int __read_mostly pat_enabled = 1; |
| 33 | 33 | ||
| 34 | void __cpuinit pat_disable(const char *reason) | 34 | static inline void pat_disable(const char *reason) |
| 35 | { | 35 | { |
| 36 | pat_enabled = 0; | 36 | pat_enabled = 0; |
| 37 | printk(KERN_INFO "%s\n", reason); | 37 | printk(KERN_INFO "%s\n", reason); |