Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
tjh.dev
kernel
os
linux
x86, mce: remove incorrect __cpuinit for mce_cpu_features()
Impact: Bug fix on UP
Checkin 6ec68bff3c81e776a455f6aca95c8c5f1d630198:
x86, mce: reinitialize per cpu features on resume
introduced a call to mce_cpu_features() in the resume path, in order
for the MCE machinery to get properly reinitialized after a resume.
However, this function (and its successors) was flagged __cpuinit,
which becomes __init on UP configurations (on SMP suspend/resume
requires CPU hotplug and so this would not be seen.)
Remove the offending __cpuinit annotations for mce_cpu_features() and
its successor functions.
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
+1
-1
arch/x86/kernel/cpu/mcheck/mce_64.c
+1
-1
arch/x86/kernel/cpu/mcheck/mce_64.c
+1
-1
arch/x86/kernel/cpu/mcheck/mce_amd_64.c
+1
-1
arch/x86/kernel/cpu/mcheck/mce_amd_64.c
···
121
121
}
122
122
123
123
/* cpu init entry point, called from mce.c with preempt off */
124
-
void __cpuinit mce_amd_feature_init(struct cpuinfo_x86 *c)
124
+
void mce_amd_feature_init(struct cpuinfo_x86 *c)
125
125
{
126
126
unsigned int bank, block;
127
127
unsigned int cpu = smp_processor_id();
+2
-2
arch/x86/kernel/cpu/mcheck/mce_intel_64.c
+2
-2
arch/x86/kernel/cpu/mcheck/mce_intel_64.c
···
30
30
irq_exit();
31
31
}
32
32
33
-
static void __cpuinit intel_init_thermal(struct cpuinfo_x86 *c)
33
+
static void intel_init_thermal(struct cpuinfo_x86 *c)
34
34
{
35
35
u32 l, h;
36
36
int tm2 = 0;
···
84
84
return;
85
85
}
86
86
87
-
void __cpuinit mce_intel_feature_init(struct cpuinfo_x86 *c)
87
+
void mce_intel_feature_init(struct cpuinfo_x86 *c)
88
88
{
89
89
intel_init_thermal(c);
90
90
}