x86, MCE, AMD: Remove local_allocate_... wrapper (26ab256e) · Commits · e / devices / android_kernel_fairphone_FP4

arch/x86/kernel/cpu/mcheck/mce_amd.c

+3 −8

Original line number	Diff line number	Diff line
		@@ -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 @@ 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);
		@@ -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;