diff options
author | Ingo Molnar <mingo@elte.hu> | 2007-02-16 04:27:34 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-16 11:13:57 -0500 |
commit | 95492e4646e5de8b43d9a7908d6177fb737b61f0 (patch) | |
tree | ae25cd206ca76f78d50ac2a206ef012e0ab1d9df /arch/x86_64/kernel/time.c | |
parent | 92c7e00254b2d0efc1e36ac3e45474ce1871b6b2 (diff) |
[PATCH] x86: rewrite SMP TSC sync code
make the TSC synchronization code more robust, and unify it between x86_64 and
i386.
The biggest change is the removal of the 'fix up TSCs' code on x86_64 and
i386, in some rare cases it was /causing/ time-warps on SMP systems.
The new code only checks for TSC asynchronity - and if it can prove a
time-warp (if it can observe the TSC going backwards when going from one CPU
to another within a critical section), then the TSC clock-source is turned
off.
The TSC synchronization-checking code also got moved into a separate file.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: john stultz <johnstul@us.ibm.com>
Cc: Roman Zippel <zippel@linux-m68k.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/x86_64/kernel/time.c')
-rw-r--r-- | arch/x86_64/kernel/time.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/arch/x86_64/kernel/time.c b/arch/x86_64/kernel/time.c index 3cc6886f1fb7..8cb2b2d35f5d 100644 --- a/arch/x86_64/kernel/time.c +++ b/arch/x86_64/kernel/time.c | |||
@@ -944,12 +944,23 @@ void __init time_init(void) | |||
944 | #endif | 944 | #endif |
945 | } | 945 | } |
946 | 946 | ||
947 | static int tsc_unstable = 0; | ||
948 | |||
949 | void mark_tsc_unstable(void) | ||
950 | { | ||
951 | tsc_unstable = 1; | ||
952 | } | ||
953 | EXPORT_SYMBOL_GPL(mark_tsc_unstable); | ||
954 | |||
947 | /* | 955 | /* |
948 | * Make an educated guess if the TSC is trustworthy and synchronized | 956 | * Make an educated guess if the TSC is trustworthy and synchronized |
949 | * over all CPUs. | 957 | * over all CPUs. |
950 | */ | 958 | */ |
951 | __cpuinit int unsynchronized_tsc(void) | 959 | __cpuinit int unsynchronized_tsc(void) |
952 | { | 960 | { |
961 | if (tsc_unstable) | ||
962 | return 1; | ||
963 | |||
953 | #ifdef CONFIG_SMP | 964 | #ifdef CONFIG_SMP |
954 | if (apic_is_clustered_box()) | 965 | if (apic_is_clustered_box()) |
955 | return 1; | 966 | return 1; |