aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel
diff options
context:
space:
mode:
authorBorislav Petkov <borislav.petkov@amd.com>2012-05-02 10:43:02 -0400
committerBorislav Petkov <borislav.petkov@amd.com>2012-06-07 06:43:43 -0400
commit26ab256eaac7af26ecd9ba893b5159a3b38c8a1c (patch)
treeb833a74c9f0880e758921a77d1a840a65bd8a889 /arch/x86/kernel
parent92e26e2a1a7d5fe6538e4a676f9c383966f894a7 (diff)
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/x86/kernel')
-rw-r--r--arch/x86/kernel/cpu/mcheck/mce_amd.c11
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 {
61 struct kobject *kobj; 61 struct kobject *kobj;
62 struct threshold_block *blocks; 62 struct threshold_block *blocks;
63}; 63};
64
64static DEFINE_PER_CPU(struct threshold_bank * [NR_BANKS], threshold_banks); 65static DEFINE_PER_CPU(struct threshold_bank * [NR_BANKS], threshold_banks);
65 66
66static unsigned char shared_bank[NR_BANKS] = { 67static unsigned char shared_bank[NR_BANKS] = {
@@ -545,13 +546,6 @@ out_free:
545 return err; 546 return err;
546} 547}
547 548
548static __cpuinit long
549local_allocate_threshold_blocks(int cpu, unsigned int bank)
550{
551 return allocate_threshold_blocks(cpu, bank, 0,
552 MSR_IA32_MC0_MISC + bank * 4);
553}
554
555static __cpuinit int threshold_create_bank(unsigned int cpu, unsigned int bank) 549static __cpuinit int threshold_create_bank(unsigned int cpu, unsigned int bank)
556{ 550{
557 struct device *dev = per_cpu(mce_device, cpu); 551 struct device *dev = per_cpu(mce_device, cpu);
@@ -575,7 +569,8 @@ static __cpuinit int threshold_create_bank(unsigned int cpu, unsigned int bank)
575 569
576 per_cpu(threshold_banks, cpu)[bank] = b; 570 per_cpu(threshold_banks, cpu)[bank] = b;
577 571
578 err = local_allocate_threshold_blocks(cpu, bank); 572 err = allocate_threshold_blocks(cpu, bank, 0,
573 MSR_IA32_MC0_MISC + bank * 4);
579 if (!err) 574 if (!err)
580 goto out; 575 goto out;
581 576