diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2007-07-26 10:41:19 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-26 11:35:20 -0700 |
| commit | 8ec3cf7d29aef773eee5bc6cd9b0fa4d3fb42480 (patch) | |
| tree | cf62a4a8c5197d0d205b093dd1f764114bae1aeb /arch | |
| parent | 4fc09385c79fa95e97365d33de9b4e046d680b94 (diff) | |
| download | linux-0-day-8ec3cf7d29aef773eee5bc6cd9b0fa4d3fb42480.tar.gz linux-0-day-8ec3cf7d29aef773eee5bc6cd9b0fa4d3fb42480.tar.xz | |
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>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86_64/kernel/tsc.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/x86_64/kernel/tsc.c b/arch/x86_64/kernel/tsc.c index 9b76b03d06001..2a59bde663f2f 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. |