Gitweb: http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=8ec3cf7d29aef773eee5bc6cd9b0fa4d3fb42480 Commit: 8ec3cf7d29aef773eee5bc6cd9b0fa4d3fb42480 Parent: 4fc09385c79fa95e97365d33de9b4e046d680b94 Author: Thomas Gleixner <[EMAIL PROTECTED]> AuthorDate: Thu Jul 26 10:41:19 2007 -0700 Committer: Linus Torvalds <[EMAIL PROTECTED]> CommitDate: Thu Jul 26 11:35:20 2007 -0700
x86_64: cleanup tsc.c merge artifact tsc_unstable is declared twice. Signed-off-by: Thomas Gleixner <[EMAIL PROTECTED]> Cc: Andi Kleen <[EMAIL PROTECTED]> Signed-off-by: Andrew Morton <[EMAIL PROTECTED]> Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]> --- 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 9b76b03..2a59bde 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. - To unsubscribe from this list: send the line "unsubscribe git-commits-head" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html