projects
/
kernel
/
kernel-generic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
4fc0938
)
x86_64: cleanup tsc.c merge artifact
author
Thomas Gleixner
<tglx@linutronix.de>
Thu, 26 Jul 2007 17:41:19 +0000
(10:41 -0700)
committer
Linus Torvalds
<torvalds@woody.linux-foundation.org>
Thu, 26 Jul 2007 18:35:20 +0000
(11:35 -0700)
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>
arch/x86_64/kernel/tsc.c
patch
|
blob
|
history
diff --git
a/arch/x86_64/kernel/tsc.c
b/arch/x86_64/kernel/tsc.c
index
9b76b03
..
2a59bde
100644
(file)
--- 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.