diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-05-19 03:23:07 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-05-19 03:23:07 -0400 |
| commit | a8ac1ae3a2a8ceb5bc1d334a502d42f59b91379c (patch) | |
| tree | fa3c8e81ffa64798e85425cf139fdd6ba3fd7963 /arch/x86/mm/pat.c | |
| parent | b4ef290d7c3abd1bf8cefcf8def359537fda7f31 (diff) | |
| parent | b8291ad07a7f3b5b990900f0001198ac23ba893e (diff) | |
Merge branch 'linus' into x86/pat
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 c0d5680d5f3c..a1cbea0b79b1 100644 --- a/arch/x86/mm/pat.c +++ b/arch/x86/mm/pat.c | |||
| @@ -28,7 +28,7 @@ | |||
| 28 | #ifdef CONFIG_X86_PAT | 28 | #ifdef CONFIG_X86_PAT |
| 29 | int __read_mostly pat_wc_enabled = 1; | 29 | int __read_mostly pat_wc_enabled = 1; |
| 30 | 30 | ||
| 31 | void __init pat_disable(char *reason) | 31 | void __cpuinit pat_disable(char *reason) |
| 32 | { | 32 | { |
| 33 | pat_wc_enabled = 0; | 33 | pat_wc_enabled = 0; |
| 34 | printk(KERN_INFO "%s\n", reason); | 34 | printk(KERN_INFO "%s\n", reason); |