x86: Simplify code by removing a !SMP #ifdefs from 'struct cpuinfo_x86'

[pandora-kernel.git] / arch / x86 / kernel / cpu / mcheck / mce_amd.c

diff --git a/arch/x86/kernel/cpu/mcheck/mce_amd.c b/arch/x86/kernel/cpu/mcheck/mce_amd.c
index 445a61c..d4444be 100644 (file)
--- a/arch/x86/kernel/cpu/mcheck/mce_amd.c
+++ b/arch/x86/kernel/cpu/mcheck/mce_amd.c
@@ -65,11 +65,9 @@ struct threshold_bank {
 };
 static DEFINE_PER_CPU(struct threshold_bank * [NR_BANKS], threshold_banks);
 
 };
 static DEFINE_PER_CPU(struct threshold_bank * [NR_BANKS], threshold_banks);
 

-#ifdef CONFIG_SMP

 static unsigned char shared_bank[NR_BANKS] = {
        0, 0, 0, 0, 1
 };
 static unsigned char shared_bank[NR_BANKS] = {
        0, 0, 0, 0, 1
 };

-#endif

 
 static DEFINE_PER_CPU(unsigned char, bank_map);        /* see which banks are on */
 
 
 static DEFINE_PER_CPU(unsigned char, bank_map);        /* see which banks are on */
 


@@ -227,10 +225,9 @@ void mce_amd_feature_init(struct cpuinfo_x86 *c)
 
                        if (!block)
                                per_cpu(bank_map, cpu) |= (1 << bank);
 
                        if (!block)
                                per_cpu(bank_map, cpu) |= (1 << bank);

-#ifdef CONFIG_SMP
+

                        if (shared_bank[bank] && c->cpu_core_id)
                                break;
                        if (shared_bank[bank] && c->cpu_core_id)
                                break;

-#endif

 
                        memset(&b, 0, sizeof(b));
                        b.cpu                   = cpu;
 
                        memset(&b, 0, sizeof(b));
                        b.cpu                   = cpu;