linux-kernel - [PATCH] x86_64: cleanup tsc.c merge artifact

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Date:	Thu, 26 Jul 2007 11:47:51 +0200
From:	Thomas Gleixner <tglx@...utronix.de>
To:	Andi Kleen <ak@...e.de>
Cc:	Andrew Morton <akpm@...l.org>, Ingo Molnar <mingo@...e.hu>,
	LKML <linux-kernel@...r.kernel.org>
Subject: [PATCH] x86_64: cleanup tsc.c merge artifact

tsc_unstable is declared twice.

Signed-off-by: Thomas Gleixner <tglx@...utronix.de>

---
 arch/x86_64/kernel/tsc.c |    2 --
 1 file changed, 2 deletions(-)

Index: linux-2.6.23-rc1/arch/x86_64/kernel/tsc.c
===================================================================
--- linux-2.6.23-rc1.orig/arch/x86_64/kernel/tsc.c	2007-07-26 09:45:51.000000000 +0200
+++ linux-2.6.23-rc1/arch/x86_64/kernel/tsc.c	2007-07-26 09:45:53.000000000 +0200
@@ -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 linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/