From ae1990ace104c7dad7adcadd5afc958f89c1694f Mon Sep 17 00:00:00 2001
From: john stultz <johnstul@us.ibm.com>
Date: Tue, 17 Oct 2006 00:09:32 -0700
Subject: [PATCH] --- yaml --- r: 39711 b: refs/heads/master c:
 3f4a0b917ce72ef47e438d354c433eb645218e87 h: refs/heads/master i:   39709:
 28802e13cc8c6beb30e78a953031a54be9bfb88a   39707:
 cfff1fd40f68d2258eede1c24db111acf904d415   39703:
 f5288a80a53ee7d6ddc51a978e4daaee949cb486   39695:
 219f4557f7f95c65b0465cde0b35106be8925a5a   39679:
 1d66859e295949d3ac20ddca83749b6780e651cc v: v3

---
 [refs]                         | 2 +-
 trunk/arch/i386/kernel/i8253.c | 2 +-
 trunk/arch/i386/kernel/tsc.c   | 6 +++---
 trunk/kernel/time/jiffies.c    | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index af598d92b5c9..588a15f596b1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b9f5d8040b470e4f74e3266ece2969ef06d0f8aa
+refs/heads/master: 3f4a0b917ce72ef47e438d354c433eb645218e87
diff --git a/trunk/arch/i386/kernel/i8253.c b/trunk/arch/i386/kernel/i8253.c
index 477b24daff53..9a0060b92e32 100644
--- a/trunk/arch/i386/kernel/i8253.c
+++ b/trunk/arch/i386/kernel/i8253.c
@@ -109,7 +109,7 @@ static struct clocksource clocksource_pit = {
 
 static int __init init_pit_clocksource(void)
 {
-	if (num_possible_cpus() > 4) /* PIT does not scale! */
+	if (num_possible_cpus() > 1) /* PIT does not scale! */
 		return 0;
 
 	clocksource_pit.mult = clocksource_hz2mult(CLOCK_TICK_RATE, 20);
diff --git a/trunk/arch/i386/kernel/tsc.c b/trunk/arch/i386/kernel/tsc.c
index b8fa0a8b2e47..fbc95828cd74 100644
--- a/trunk/arch/i386/kernel/tsc.c
+++ b/trunk/arch/i386/kernel/tsc.c
@@ -349,8 +349,8 @@ static int tsc_update_callback(void)
 	int change = 0;
 
 	/* check to see if we should switch to the safe clocksource: */
-	if (clocksource_tsc.rating != 50 && check_tsc_unstable()) {
-		clocksource_tsc.rating = 50;
+	if (clocksource_tsc.rating != 0 && check_tsc_unstable()) {
+		clocksource_tsc.rating = 0;
 		clocksource_reselect();
 		change = 1;
 	}
@@ -461,7 +461,7 @@ static int __init init_tsc_clocksource(void)
 							clocksource_tsc.shift);
 		/* lower the rating if we already know its unstable: */
 		if (check_tsc_unstable())
-			clocksource_tsc.rating = 50;
+			clocksource_tsc.rating = 0;
 
 		init_timer(&verify_tsc_freq_timer);
 		verify_tsc_freq_timer.function = verify_tsc_freq;
diff --git a/trunk/kernel/time/jiffies.c b/trunk/kernel/time/jiffies.c
index 126bb30c4afe..a99b2a6e6a07 100644
--- a/trunk/kernel/time/jiffies.c
+++ b/trunk/kernel/time/jiffies.c
@@ -57,7 +57,7 @@ static cycle_t jiffies_read(void)
 
 struct clocksource clocksource_jiffies = {
 	.name		= "jiffies",
-	.rating		= 0, /* lowest rating*/
+	.rating		= 1, /* lowest valid rating*/
 	.read		= jiffies_read,
 	.mask		= 0xffffffff, /*32bits*/
 	.mult		= NSEC_PER_JIFFY << JIFFIES_SHIFT, /* details above */