Merge branch 'linus' into x86/pat

2008-05-19 09:23:07 +02:00
parent b4ef290d7c b8291ad07a
commit a8ac1ae3a2
105 changed files with 2743 additions and 826 deletions
--- a/arch/x86/mm/pat.c
+++ b/arch/x86/mm/pat.c
@@ -28,7 +28,7 @@
 #ifdef CONFIG_X86_PAT
 int __read_mostly pat_wc_enabled = 1;

-void __init pat_disable(char *reason)
+void __cpuinit pat_disable(char *reason)
 {
 	pat_wc_enabled = 0;
 	printk(KERN_INFO "%s\n", reason);