diff options
author | 2009-03-16 17:07:33 +0900 | |
---|---|---|
committer | 2009-03-16 09:15:32 +0100 | |
commit | 514ec49a5f5146a6c0ade1a688787acf13617868 (patch) | |
tree | 62244c0fcad4610f0fd99938443a957b3f07a39e /arch/x86/mm/fault.c | |
parent | Merge branches 'x86/apic', 'x86/asm', 'x86/cleanups', 'x86/debug', 'x86/kconfig', 'x86/mm', 'x86/ptrace', 'x86/setup' and 'x86/urgent'; commit 'v2.6.29-rc8' into x86/core (diff) | |
download | linux-dev-514ec49a5f5146a6c0ade1a688787acf13617868.tar.xz linux-dev-514ec49a5f5146a6c0ade1a688787acf13617868.zip |
x86, mce: remove incorrect __cpuinit for intel_init_cmci()
Impact: Bug fix on UP
Referring commit cc3ca22063784076bd240fda87217387a8f2ae92,
Peter removed __cpuinit annotations for mce_cpu_features()
and its successor functions, which caused troubles on UP
configurations.
However the intel_init_cmci() was introduced after that and
it also has __cpuinit annotation even though it is called from
mce_cpu_features(). Remove the annotation from that function
too.
Signed-off-by: Hidetoshi Seto <seto.hidetoshi@jp.fujitsu.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Andi Kleen <ak@linux.intel.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/mm/fault.c')
0 files changed, 0 insertions, 0 deletions