summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorAvi Kivity <avi@qumranet.com>2008-05-14 12:20:32 +0300
committerThomas Gleixner <tglx@linutronix.de>2008-05-17 22:57:20 +0200
commit31f4d870b02e1590260ab7f2a9ff74306bd27e88 (patch)
tree9384bfc0e6bc23993feefc3344aa91ef2b0d933a /arch
parenta738d897b7b03b83488ae74a9bc03d26a2875dc6 (diff)
downloadop-kernel-dev-31f4d870b02e1590260ab7f2a9ff74306bd27e88.zip
op-kernel-dev-31f4d870b02e1590260ab7f2a9ff74306bd27e88.tar.gz
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>
Diffstat (limited to 'arch')
-rw-r--r--arch/x86/mm/pat.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/mm/pat.c b/arch/x86/mm/pat.c
index bcb1a8e..de3a998 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);
OpenPOWER on IntegriCloud