From 8ec3cf7d29aef773eee5bc6cd9b0fa4d3fb42480 Mon Sep 17 00:00:00 2001 From: Thomas Gleixner Date: Thu, 26 Jul 2007 10:41:19 -0700 Subject: [PATCH] x86_64: cleanup tsc.c merge artifact tsc_unstable is declared twice. Signed-off-by: Thomas Gleixner Cc: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- arch/x86_64/kernel/tsc.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/arch/x86_64/kernel/tsc.c b/arch/x86_64/kernel/tsc.c index 9b76b03d060..2a59bde663f 100644 --- a/arch/x86_64/kernel/tsc.c +++ b/arch/x86_64/kernel/tsc.c @@ -118,8 +118,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. -- 2.41.1