Merge branch 'linus' into x86/pat

1 files changed, 1 insertions, 1 deletions

diff --git a/arch/x86/mm/pat.c b/arch/x86/mm/pat.c
index 4beccea0897f..7c21572bbdda 100644
--- a/arch/x86/mm/pat.c
+++ b/arch/x86/mm/pat.c
@@ -34,7 +34,7 @@ void __cpuinit pat_disable(char *reason)
         printk(KERN_INFO "%s\n", reason);
 }
 
-static int nopat(char *str)
+static int __init nopat(char *str)
 {
         pat_disable("PAT support disabled.");
         return 0;