The patch titled
Cleanup: Unify tsc_unstable and tsc_disable
has been removed from the -mm tree. Its filename was
cleanup-unify-tsc_unstable-and-tsc_disable.patch
This patch was dropped because dropping the pther patch broke it
------------------------------------------------------
Subject: Cleanup: Unify tsc_unstable and tsc_disable
From: "Guillaume Chazarain" <[EMAIL PROTECTED]>
tsc_unstable and tsc_disable serve the same purpose.
Signed-off-by: Guillaume Chazarain <[EMAIL PROTECTED]>
Cc: Thomas Gleixner <[EMAIL PROTECTED]>
Cc: Ingo Molnar <[EMAIL PROTECTED]>
Cc: john stultz <[EMAIL PROTECTED]>
Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
---
arch/i386/kernel/tsc.c | 26 ++++++++------------------
1 file changed, 8 insertions(+), 18 deletions(-)
diff -puN arch/i386/kernel/tsc.c~cleanup-unify-tsc_unstable-and-tsc_disable
arch/i386/kernel/tsc.c
--- a/arch/i386/kernel/tsc.c~cleanup-unify-tsc_unstable-and-tsc_disable
+++ a/arch/i386/kernel/tsc.c
@@ -50,16 +50,6 @@ static int __init tsc_setup(char *str)
__setup("notsc", tsc_setup);
-/*
- * code to mark and check if the TSC is unstable
- * due to cpufreq or due to unsynced TSCs
- */
-static int tsc_unstable;
-
-static inline int check_tsc_unstable(void)
-{
- return tsc_unstable;
-}
/* Accellerators for sched_clock()
* convert from cycles(64bits) => nanoseconds (64bits)
@@ -106,7 +96,7 @@ unsigned long long sched_clock(void)
/*
* Fall back to jiffies if there's no TSC available:
*/
- if (tsc_unstable || unlikely(tsc_disable))
+ if (unlikely(tsc_disable))
/* No locking but a rare wrong value is not a big deal: */
return (jiffies_64 - INITIAL_JIFFIES) * (1000000000 / HZ);
@@ -282,8 +272,8 @@ static struct clocksource clocksource_ts
void mark_tsc_unstable(void)
{
- if (!tsc_unstable) {
- tsc_unstable = 1;
+ if (!tsc_disable) {
+ tsc_disable = 1;
/* Can be called before registration */
if (clocksource_tsc.mult)
clocksource_change_rating(&clocksource_tsc, 0);
@@ -297,7 +287,7 @@ static int __init dmi_mark_tsc_unstable(
{
printk(KERN_NOTICE "%s detected: marking TSC unstable.\n",
d->ident);
- tsc_unstable = 1;
+ tsc_disable = 1;
return 0;
}
@@ -320,7 +310,7 @@ static struct dmi_system_id __initdata b
*/
__cpuinit int unsynchronized_tsc(void)
{
- if (!cpu_has_tsc || tsc_unstable)
+ if (!cpu_has_tsc || tsc_disable)
return 1;
/*
* Intel systems are normally all synchronized.
@@ -329,9 +319,9 @@ __cpuinit int unsynchronized_tsc(void)
if (boot_cpu_data.x86_vendor != X86_VENDOR_INTEL) {
/* assume multi socket systems are not synchronized: */
if (num_possible_cpus() > 1)
- tsc_unstable = 1;
+ tsc_disable = 1;
}
- return tsc_unstable;
+ return tsc_disable;
}
/*
@@ -381,7 +371,7 @@ void __init tsc_init(void)
clocksource_tsc.mult = clocksource_khz2mult(current_tsc_khz,
clocksource_tsc.shift);
/* lower the rating if we already know its unstable: */
- if (check_tsc_unstable()) {
+ if (tsc_disable) {
clocksource_tsc.rating = 0;
clocksource_tsc.flags &= ~CLOCK_SOURCE_IS_CONTINUOUS;
}
_
Patches currently in -mm which might be from [EMAIL PROTECTED] are
cleanup-unify-tsc_unstable-and-tsc_disable.patch
possible-bugfix-make-dmi_mark_tsc_unstable-call-mark_tsc_unstable.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
