From: Thomas Gleixner <tglx@linutronix.de>
Date: Thu, 26 Jul 2007 17:41:19 +0000 (-0700)
Subject: x86_64: cleanup tsc.c merge artifact
X-Git-Tag: v2.6.23-rc2~197
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8ec3cf7d29aef773eee5bc6cd9b0fa4d3fb42480;p=linux-2.6

x86_64: cleanup tsc.c merge artifact

tsc_unstable is declared twice.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Andi Kleen <ak@suse.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
---

diff --git a/arch/x86_64/kernel/tsc.c b/arch/x86_64/kernel/tsc.c
index 9b76b03d06..2a59bde663 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.