From: Avi Kivity <avi@qumranet.com>
Date: Wed, 14 May 2008 09:20:32 +0000 (+0300)
Subject: x86: fix crash on cpu hotplug on pat-incapable machines
X-Git-Tag: v2.6.26-rc3~21^2~1
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=31f4d870b02e1590260ab7f2a9ff74306bd27e88;p=linux-2.6-omap-h63xx.git

x86: fix crash on cpu hotplug on pat-incapable machines

pat_disable() is __init, which means it goes away after booting is complete.
Unfortunately it is used by the hotplug code if the machine is not
pat-capable, causing a crash.

Fix by marking pat_disable() as __cpuinit.

Signed-off-by: Avi Kivity <avi@qumranet.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
---

diff --git a/arch/x86/mm/pat.c b/arch/x86/mm/pat.c
index bcb1a8e4b2d..de3a9981245 100644
--- 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);