Skip to content

Commit

Permalink
x86, MCE, AMD: Remove local_allocate_... wrapper
Browse files Browse the repository at this point in the history
It is unneeded now so drop it.

Signed-off-by: Borislav Petkov <borislav.petkov@amd.com>
  • Loading branch information
Borislav Petkov committed Jun 7, 2012
1 parent 92e26e2 commit 26ab256
Showing 1 changed file with 3 additions and 8 deletions.
11 changes: 3 additions & 8 deletions arch/x86/kernel/cpu/mcheck/mce_amd.c
Original file line number Diff line number Diff line change
Expand Up @@ -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] = {
Expand Down Expand Up @@ -545,13 +546,6 @@ static __cpuinit int allocate_threshold_blocks(unsigned int cpu,
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);
Expand All @@ -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;

Expand Down

0 comments on commit 26ab256

Please sign in to comment.