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

Commit 7ff98478 authored by Thomas Gleixner's avatar Thomas Gleixner Committed by Linus Torvalds
Browse files

x86_64: Remove dead code and other janitor work in tsc.c 



Remove unused code and variables and do some codingstyle / whitespace
cleanups while at it.

Cc: john stultz <johnstul@us.ibm.com>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarChris Wright <chrisw@sous-sol.org>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarAndi Kleen <ak@suse.de>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent ef81ab2c

arch/x86_64/kernel/tsc.c

+11 −28
Original line number Diff line number Diff line
@@ -61,25 +61,9 @@ inline int check_tsc_unstable(void) 
 * first tick after the change will be slightly wrong.

 */



#include <linux/workqueue.h>



static unsigned int cpufreq_delayed_issched = 0;

static unsigned int cpufreq_init = 0;

static struct work_struct cpufreq_delayed_get_work;



static void handle_cpufreq_delayed_get(struct work_struct *v)

{

	unsigned int cpu;

	for_each_online_cpu(cpu) {

		cpufreq_get(cpu);

	}

	cpufreq_delayed_issched = 0;

}



static unsigned int  ref_freq = 0;

static unsigned long loops_per_jiffy_ref = 0;



static unsigned long tsc_khz_ref = 0;

static unsigned int  ref_freq;

static unsigned long loops_per_jiffy_ref;

static unsigned long tsc_khz_ref;



static int time_cpufreq_notifier(struct notifier_block *nb, unsigned long val,

				 void *data)
@@ -125,10 +109,8 @@ static struct notifier_block time_cpufreq_notifier_block = { 


static int __init cpufreq_tsc(void)

{

	INIT_WORK(&cpufreq_delayed_get_work, handle_cpufreq_delayed_get);

	if (!cpufreq_register_notifier(&time_cpufreq_notifier_block,

				       CPUFREQ_TRANSITION_NOTIFIER))

		cpufreq_init = 1;

	cpufreq_register_notifier(&time_cpufreq_notifier_block,

				  CPUFREQ_TRANSITION_NOTIFIER);

	return 0;

}
@@ -156,7 +138,8 @@ __cpuinit int unsynchronized_tsc(void) 
	if (boot_cpu_data.x86_vendor == X86_VENDOR_INTEL) {

#ifdef CONFIG_ACPI

		/* But TSC doesn't tick in C3 so don't use it there */

		if (acpi_gbl_FADT.header.length > 0 && acpi_gbl_FADT.C3latency < 1000)

		if (acpi_gbl_FADT.header.length > 0 &&

		    acpi_gbl_FADT.C3latency < 1000)

			return 1;

#endif

		return 0;