diff options
| author | Borislav Petkov <borislav.petkov@amd.com> | 2012-05-02 16:43:02 +0200 |
|---|---|---|
| committer | Borislav Petkov <borislav.petkov@amd.com> | 2012-06-07 12:43:43 +0200 |
| commit | 26ab256eaac7af26ecd9ba893b5159a3b38c8a1c (patch) | |
| tree | b833a74c9f0880e758921a77d1a840a65bd8a889 /arch | |
| parent | 92e26e2a1a7d5fe6538e4a676f9c383966f894a7 (diff) | |
| download | blackbird-obmc-linux-26ab256eaac7af26ecd9ba893b5159a3b38c8a1c.tar.gz blackbird-obmc-linux-26ab256eaac7af26ecd9ba893b5159a3b38c8a1c.zip | |
x86, MCE, AMD: Remove local_allocate_... wrapper
It is unneeded now so drop it.
Signed-off-by: Borislav Petkov <borislav.petkov@amd.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/kernel/cpu/mcheck/mce_amd.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/arch/x86/kernel/cpu/mcheck/mce_amd.c b/arch/x86/kernel/cpu/mcheck/mce_amd.c index 2a5dd30f9969..7fd02cac962b 100644 --- a/arch/x86/kernel/cpu/mcheck/mce_amd.c +++ b/arch/x86/kernel/cpu/mcheck/mce_amd.c @@ -61,6 +61,7 @@ struct threshold_bank { struct kobject *kobj; struct threshold_block *blocks; }; + static DEFINE_PER_CPU(struct threshold_bank * [NR_BANKS], threshold_banks); static unsigned char shared_bank[NR_BANKS] = { @@ -545,13 +546,6 @@ out_free: return err; } -static __cpuinit long -local_allocate_threshold_blocks(int cpu, unsigned int bank) -{ - return allocate_threshold_blocks(cpu, bank, 0, - MSR_IA32_MC0_MISC + bank * 4); -} - static __cpuinit int threshold_create_bank(unsigned int cpu, unsigned int bank) { struct device *dev = per_cpu(mce_device, cpu); @@ -575,7 +569,8 @@ static __cpuinit int threshold_create_bank(unsigned int cpu, unsigned int bank) per_cpu(threshold_banks, cpu)[bank] = b; - err = local_allocate_threshold_blocks(cpu, bank); + err = allocate_threshold_blocks(cpu, bank, 0, + MSR_IA32_MC0_MISC + bank * 4); if (!err) goto out; |
