]> git.baikalelectronics.ru Git - kernel.git/commit
x86, mce: remove incorrect __cpuinit for mce_cpu_features()
authorH. Peter Anvin <hpa@zytor.com>
Sat, 21 Feb 2009 07:35:51 +0000 (23:35 -0800)
committerH. Peter Anvin <hpa@zytor.com>
Sat, 21 Feb 2009 07:40:40 +0000 (23:40 -0800)
commit12c82f7ff388eec7425d4fc3ba19a8a2c64046f2
treefeaa2a4df993934fbecd8cb9da559d04dfc0bc64
parent3c3b4ebe528d9a6e860dca8d4edd93dc2af74385
x86, mce: remove incorrect __cpuinit for mce_cpu_features()

Impact: Bug fix on UP

Checkin 310d51227ac0e9c33d6a7466f63583dd4aad8ec1:
    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>
arch/x86/kernel/cpu/mcheck/mce_64.c
arch/x86/kernel/cpu/mcheck/mce_amd_64.c
arch/x86/kernel/cpu/mcheck/mce_intel_64.c