diff options
| author | H. Peter Anvin <hpa@linux.intel.com> | 2009-02-23 14:05:56 -0800 |
|---|---|---|
| committer | H. Peter Anvin <hpa@linux.intel.com> | 2009-02-23 14:05:56 -0800 |
| commit | dc731ca60954310be0993e8992d450c7089fd13d (patch) | |
| tree | 6a997916f963d9e6dfa76fc5564296f57c3f909e /arch/x86/kernel/cpu/mcheck/mce_amd_64.c | |
| parent | ec5b3d32437571b8a742069a4cfd04edb6b6eda5 (diff) | |
| parent | 20f4d6c3a2a23c5d7d9cc7f42fbb943ca7a03d1f (diff) | |
| download | kernel_goldelico_gta04-dc731ca60954310be0993e8992d450c7089fd13d.zip kernel_goldelico_gta04-dc731ca60954310be0993e8992d450c7089fd13d.tar.gz kernel_goldelico_gta04-dc731ca60954310be0993e8992d450c7089fd13d.tar.bz2 | |
Merge branch 'x86/urgent' into x86/mce2
Diffstat (limited to 'arch/x86/kernel/cpu/mcheck/mce_amd_64.c')
| -rw-r--r-- | arch/x86/kernel/cpu/mcheck/mce_amd_64.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/cpu/mcheck/mce_amd_64.c b/arch/x86/kernel/cpu/mcheck/mce_amd_64.c index 0069c65..e82c820 100644 --- a/arch/x86/kernel/cpu/mcheck/mce_amd_64.c +++ b/arch/x86/kernel/cpu/mcheck/mce_amd_64.c @@ -121,7 +121,7 @@ static long threshold_restart_bank(void *_tr) } /* cpu init entry point, called from mce.c with preempt off */ -void __cpuinit mce_amd_feature_init(struct cpuinfo_x86 *c) +void mce_amd_feature_init(struct cpuinfo_x86 *c) { unsigned int bank, block; unsigned int cpu = smp_processor_id(); |