The patch titled
Bugfix: Don't use the TSC in sched_clock if unstable
has been removed from the -mm tree. Its filename was
bugfix-dont-use-the-tsc-in-sched_clock-if-unstable.patch
This patch was dropped because it was nacked by the maintainer
------------------------------------------------------
Subject: Bugfix: Don't use the TSC in sched_clock if unstable
From: "Guillaume Chazarain" <guichaz@xxxxxxxxx>
http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=f9690982b8c2f9a2c65acdc113e758ec356676a3
caused a regression by letting sched_clock use the TSC even when cpufreq
disabled it. This caused scheduling weirdnesses.
Signed-off-by: Guillaume Chazarain <guichaz@xxxxxxxx>
Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Cc: Ingo Molnar <mingo@xxxxxxx>
Cc: john stultz <johnstul@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
arch/i386/kernel/tsc.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff -puN arch/i386/kernel/tsc.c~bugfix-dont-use-the-tsc-in-sched_clock-if-unstable arch/i386/kernel/tsc.c
--- a/arch/i386/kernel/tsc.c~bugfix-dont-use-the-tsc-in-sched_clock-if-unstable
+++ a/arch/i386/kernel/tsc.c
@@ -105,7 +105,7 @@ unsigned long long sched_clock(void)
/*
* Fall back to jiffies if there's no TSC available:
*/
- if (unlikely(tsc_disable))
+ if (tsc_unstable || unlikely(tsc_disable))
/* No locking but a rare wrong value is not a big deal: */
return (jiffies_64 - INITIAL_JIFFIES) * (1000000000 / HZ);
_
Patches currently in -mm which might be from guichaz@xxxxxxxxx are
bugfix-dont-use-the-tsc-in-sched_clock-if-unstable.patch
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 majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
