x86, mce: remove incorrect __cpuinit for mce_cpu_features()

Browse source

Impact: Bug fix on UP

Checkin 6ec68bff3c:
    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>

...

This commit is contained in:

H. Peter Anvin 2009-02-20 23:35:51 -08:00

parent 8cbb5bc374

commit cc3ca22063

3 changed files with 4 additions and 4 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

2

arch/x86/kernel/cpu/mcheck/mce_64.c

View file

2

arch/x86/kernel/cpu/mcheck/mce_amd_64.c

View file

4

arch/x86/kernel/cpu/mcheck/mce_intel_64.c

View file