From 64dcad524b6caa97c52700b3cbc382d2aa7faf1d Mon Sep 17 00:00:00 2001 From: Sam Ravnborg Date: Wed, 30 Jan 2008 13:33:36 +0100 Subject: [PATCH] --- yaml --- r: 80401 b: refs/heads/master c: 1e35669d017eac5bea4739f927b28e64731504e1 h: refs/heads/master i: 80399: ca04fc3fc1eb07609b68f38d7a73e96d6fbc109f v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/cpu/mcheck/mce_64.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 336d47407acb..66b70c5a99e7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ff472a114ca11f5354912745fbb94bb66ec10916 +refs/heads/master: 1e35669d017eac5bea4739f927b28e64731504e1 diff --git a/trunk/arch/x86/kernel/cpu/mcheck/mce_64.c b/trunk/arch/x86/kernel/cpu/mcheck/mce_64.c index 98b23d55fe6e..9a699ed03598 100644 --- a/trunk/arch/x86/kernel/cpu/mcheck/mce_64.c +++ b/trunk/arch/x86/kernel/cpu/mcheck/mce_64.c @@ -854,8 +854,8 @@ static void mce_remove_device(unsigned int cpu) } /* Get notified when a cpu comes on/off. Be hotplug friendly. */ -static int -mce_cpu_callback(struct notifier_block *nfb, unsigned long action, void *hcpu) +static int __cpuinit mce_cpu_callback(struct notifier_block *nfb, + unsigned long action, void *hcpu) { unsigned int cpu = (unsigned long)hcpu; @@ -872,7 +872,7 @@ mce_cpu_callback(struct notifier_block *nfb, unsigned long action, void *hcpu) return NOTIFY_OK; } -static struct notifier_block mce_cpu_notifier = { +static struct notifier_block mce_cpu_notifier __cpuinitdata = { .notifier_call = mce_cpu_callback, };