From 6e94331f5c7e4899de584e65792b8a32961ce378 Mon Sep 17 00:00:00 2001
From: Avi Kivity <avi@qumranet.com>
Date: Wed, 14 May 2008 12:20:32 +0300
Subject: [PATCH] --- yaml --- r: 96833 b: refs/heads/master c:
 31f4d870b02e1590260ab7f2a9ff74306bd27e88 h: refs/heads/master i:   96831:
 d59806cc4afb48d572b7472e3dd4ce34bb6bf4bd v: v3

---
 [refs]                  | 2 +-
 trunk/arch/x86/mm/pat.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 1bda859b4b44..0f8df01bf151 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a738d897b7b03b83488ae74a9bc03d26a2875dc6
+refs/heads/master: 31f4d870b02e1590260ab7f2a9ff74306bd27e88
diff --git a/trunk/arch/x86/mm/pat.c b/trunk/arch/x86/mm/pat.c
index bcb1a8e4b2db..de3a99812450 100644
--- a/trunk/arch/x86/mm/pat.c
+++ b/trunk/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);