Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 26cbaa4d authored by Borislav Petkov's avatar Borislav Petkov Committed by Ingo Molnar
Browse files

x86/microcode/intel: Cleanup apply_microcode_intel() 



Get rid of local variable cpu_num as it is equal to @cpu now. Deref
cpu_data() only when it is really needed at the end.

No functionality change.

Tested-by: default avatarThomas Voegtle <tv@lio96.de>
Signed-off-by: default avatarBorislav Petkov <bp@suse.de>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: http://lkml.kernel.org/r/1454499225-21544-12-git-send-email-bp@alien8.de


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 58b5f2cc

arch/x86/kernel/cpu/microcode/intel.c

+7 −5
Original line number Diff line number Diff line
@@ -839,12 +839,11 @@ static int apply_microcode_intel(int cpu) 
{

	struct microcode_intel *mc;

	struct ucode_cpu_info *uci;

	struct cpuinfo_x86 *c;

	unsigned int val[2];

	int cpu_num = raw_smp_processor_id();

	struct cpuinfo_x86 *c = &cpu_data(cpu_num);



	/* We should bind the task to the CPU */

	if (WARN_ON(cpu_num != cpu))

	if (WARN_ON(raw_smp_processor_id() != cpu))

		return -1;



	uci = ucode_cpu_info + cpu;
@@ -874,15 +873,18 @@ static int apply_microcode_intel(int cpu) 


	if (val[1] != mc->hdr.rev) {

		pr_err("CPU%d update to revision 0x%x failed\n",

		       cpu_num, mc->hdr.rev);

		       cpu, mc->hdr.rev);

		return -1;

	}



	pr_info("CPU%d updated to revision 0x%x, date = %04x-%02x-%02x\n",

		cpu_num, val[1],

		cpu, val[1],

		mc->hdr.date & 0xffff,

		mc->hdr.date >> 24,

		(mc->hdr.date >> 16) & 0xff);



	c = &cpu_data(cpu);



	uci->cpu_sig.rev = val[1];

	c->microcode = val[1];