diff options
| author | H. Peter Anvin | 2009-02-23 23:05:56 +0100 |
|---|---|---|
| committer | H. Peter Anvin | 2009-02-23 23:05:56 +0100 |
| commit | dc731ca60954310be0993e8992d450c7089fd13d (patch) | |
| tree | 6a997916f963d9e6dfa76fc5564296f57c3f909e /arch/x86/kernel/cpu/mcheck/mce_64.c | |
| parent | x86, mce: remove invalid __cpuinit/__cpuexit annotations (diff) | |
| parent | Linux 2.6.29-rc6 (diff) | |
| download | kernel-qcow2-linux-dc731ca60954310be0993e8992d450c7089fd13d.tar.gz kernel-qcow2-linux-dc731ca60954310be0993e8992d450c7089fd13d.tar.xz kernel-qcow2-linux-dc731ca60954310be0993e8992d450c7089fd13d.zip | |
Merge branch 'x86/urgent' into x86/mce2
Diffstat (limited to 'arch/x86/kernel/cpu/mcheck/mce_64.c')
| -rw-r--r-- | arch/x86/kernel/cpu/mcheck/mce_64.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/cpu/mcheck/mce_64.c b/arch/x86/kernel/cpu/mcheck/mce_64.c index 0625993bf955..a4a7c686ce90 100644 --- a/arch/x86/kernel/cpu/mcheck/mce_64.c +++ b/arch/x86/kernel/cpu/mcheck/mce_64.c @@ -614,7 +614,7 @@ static void mce_cpu_quirks(struct cpuinfo_x86 *c) } -static void __cpuinit mce_cpu_features(struct cpuinfo_x86 *c) +static void mce_cpu_features(struct cpuinfo_x86 *c) { switch (c->x86_vendor) { case X86_VENDOR_INTEL: |