Commit eff4677e authored Apr 05, 2016 by Borislav Petkov Committed by Ingo Molnar Apr 13, 2016

x86/tsc: Save an indentation level in recalibrate_cpu_khz()

... by flipping the check.

Signed-off-by: Borislav Petkov <bp@suse.de>
Cc: Andy Lutomirski <luto@amacapital.net>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Brian Gerst <brgerst@gmail.com>
Cc: Denys Vlasenko <dvlasenk@redhat.com>
Cc: H. Peter Anvin <hpa@zytor.com>
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/1459837795-2588-5-git-send-email-bp@alien8.de

Signed-off-by: Ingo Molnar <mingo@kernel.org>

parent a841cca7

arch/x86/kernel/tsc.c

+8 −8

Original line number	Diff line number	Diff line
		@@ -834,15 +834,15 @@ int recalibrate_cpu_khz(void)
		#ifndef CONFIG_SMP
		unsigned long cpu_khz_old = cpu_khz;

		if (boot_cpu_has(X86_FEATURE_TSC)) {
		if (!boot_cpu_has(X86_FEATURE_TSC))
		return -ENODEV;

		tsc_khz = x86_platform.calibrate_tsc();
		cpu_khz = tsc_khz;
		cpu_data(0).loops_per_jiffy =
		cpufreq_scale(cpu_data(0).loops_per_jiffy,
		cpu_data(0).loops_per_jiffy = cpufreq_scale(cpu_data(0).loops_per_jiffy,
		cpu_khz_old, cpu_khz);

		return 0;
		} else
		return -ENODEV;
		#else
		return -ENODEV;
		#endif