From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1761225AbXFWN2l (ORCPT ); Sat, 23 Jun 2007 09:28:41 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755436AbXFWNWZ (ORCPT ); Sat, 23 Jun 2007 09:22:25 -0400 Received: from www.osadl.org ([213.239.205.134]:59267 "EHLO mail.tglx.de" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1758138AbXFWNWM (ORCPT ); Sat, 23 Jun 2007 09:22:12 -0400 Message-Id: <20070623124031.028132529@inhelltoy.tec.linutronix.de> References: <20070623124005.931747831@inhelltoy.tec.linutronix.de> User-Agent: quilt/0.46-1 Date: Sat, 23 Jun 2007 13:32:45 -0000 From: Thomas Gleixner To: Andrew Morton Cc: Andi Kleen , Ingo Molnar , Arjan van de Ven , Venkatesh Pallipadi , John Stultz , Chris Wright , LKML Subject: [patch -mm 20/28] x86-64: remove dead code and other janitor work in tsc.c Content-Disposition: inline; filename=x86-64-remove-dead-code-tsc-c.patch Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Remove unused code and variables and do some codingstyle / whitespace cleanups while at it. Signed-off-by: Thomas Gleixner Cc: john stultz Cc: Andi Kleen --- arch/x86_64/kernel/tsc.c | 41 +++++++++++------------------------------ 1 file changed, 11 insertions(+), 30 deletions(-) Index: linux-2.6.22-rc4-mm/arch/x86_64/kernel/tsc.c =================================================================== --- linux-2.6.22-rc4-mm.orig/arch/x86_64/kernel/tsc.c 2007-06-23 14:38:55.000000000 +0200 +++ linux-2.6.22-rc4-mm/arch/x86_64/kernel/tsc.c 2007-06-23 14:38:59.000000000 +0200 @@ -35,25 +35,9 @@ static inline int check_tsc_unstable(voi * first tick after the change will be slightly wrong. */ -#include - -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) @@ -97,10 +81,8 @@ static struct notifier_block time_cpufre 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; } @@ -108,8 +90,6 @@ core_initcall(cpufreq_tsc); #endif -static int tsc_unstable = 0; - /* * Make an educated guess if the TSC is trustworthy and synchronized * over all CPUs. @@ -122,17 +102,18 @@ __cpuinit int unsynchronized_tsc(void) #endif /* Most intel systems have synchronized TSCs except for multi node systems */ - if (boot_cpu_data.x86_vendor == X86_VENDOR_INTEL) { + 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; + return 0; } - /* Assume multi socket systems are not synchronized */ - return num_present_cpus() > 1; + /* Assume multi socket systems are not synchronized */ + return num_present_cpus() > 1; } int __init notsc_setup(char *s) --