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

Commit af576850 authored by Dou Liyang's avatar Dou Liyang Committed by Thomas Gleixner
Browse files

x86/timers: Make recalibrate_cpu_khz() void 



recalibrate_cpu_khz() is called from powernow K7 and Pentium 4/Xeon
CPU freq driver. It recalibrates cpu frequency in case of SMP = n
and doesn't need to return anything.

Mark it void, also remove the #else branch.

Signed-off-by: default avatarDou Liyang <douly.fnst@cn.fujitsu.com>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Link: https://lkml.kernel.org/r/1500003247-17368-2-git-send-email-douly.fnst@cn.fujitsu.com
parent eb496063

arch/x86/include/asm/timer.h

+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ 
#define TICK_SIZE (tick_nsec / 1000)



unsigned long long native_sched_clock(void);

extern int recalibrate_cpu_khz(void);

extern void recalibrate_cpu_khz(void);



extern int no_timer_check;

arch/x86/kernel/tsc.c

+2 −6
Original line number Diff line number Diff line
@@ -812,13 +812,13 @@ unsigned long native_calibrate_cpu(void) 
	return tsc_pit_min;

}



int recalibrate_cpu_khz(void)

void recalibrate_cpu_khz(void)

{

#ifndef CONFIG_SMP

	unsigned long cpu_khz_old = cpu_khz;



	if (!boot_cpu_has(X86_FEATURE_TSC))

		return -ENODEV;

		return;



	cpu_khz = x86_platform.calibrate_cpu();

	tsc_khz = x86_platform.calibrate_tsc();
@@ -828,10 +828,6 @@ int recalibrate_cpu_khz(void) 
		cpu_khz = tsc_khz;

	cpu_data(0).loops_per_jiffy = cpufreq_scale(cpu_data(0).loops_per_jiffy,

						    cpu_khz_old, cpu_khz);



	return 0;

#else

	return -ENODEV;

#endif

}