diff options
-rw-r--r-- | arch/i386/kernel/i8253.c | 2 | ||||
-rw-r--r-- | arch/i386/kernel/tsc.c | 6 | ||||
-rw-r--r-- | kernel/time/jiffies.c | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/arch/i386/kernel/i8253.c b/arch/i386/kernel/i8253.c index 477b24daff53..9a0060b92e32 100644 --- a/arch/i386/kernel/i8253.c +++ b/arch/i386/kernel/i8253.c | |||
@@ -109,7 +109,7 @@ static struct clocksource clocksource_pit = { | |||
109 | 109 | ||
110 | static int __init init_pit_clocksource(void) | 110 | static int __init init_pit_clocksource(void) |
111 | { | 111 | { |
112 | if (num_possible_cpus() > 4) /* PIT does not scale! */ | 112 | if (num_possible_cpus() > 1) /* PIT does not scale! */ |
113 | return 0; | 113 | return 0; |
114 | 114 | ||
115 | clocksource_pit.mult = clocksource_hz2mult(CLOCK_TICK_RATE, 20); | 115 | clocksource_pit.mult = clocksource_hz2mult(CLOCK_TICK_RATE, 20); |
diff --git a/arch/i386/kernel/tsc.c b/arch/i386/kernel/tsc.c index b8fa0a8b2e47..fbc95828cd74 100644 --- a/arch/i386/kernel/tsc.c +++ b/arch/i386/kernel/tsc.c | |||
@@ -349,8 +349,8 @@ static int tsc_update_callback(void) | |||
349 | int change = 0; | 349 | int change = 0; |
350 | 350 | ||
351 | /* check to see if we should switch to the safe clocksource: */ | 351 | /* check to see if we should switch to the safe clocksource: */ |
352 | if (clocksource_tsc.rating != 50 && check_tsc_unstable()) { | 352 | if (clocksource_tsc.rating != 0 && check_tsc_unstable()) { |
353 | clocksource_tsc.rating = 50; | 353 | clocksource_tsc.rating = 0; |
354 | clocksource_reselect(); | 354 | clocksource_reselect(); |
355 | change = 1; | 355 | change = 1; |
356 | } | 356 | } |
@@ -461,7 +461,7 @@ static int __init init_tsc_clocksource(void) | |||
461 | clocksource_tsc.shift); | 461 | clocksource_tsc.shift); |
462 | /* lower the rating if we already know its unstable: */ | 462 | /* lower the rating if we already know its unstable: */ |
463 | if (check_tsc_unstable()) | 463 | if (check_tsc_unstable()) |
464 | clocksource_tsc.rating = 50; | 464 | clocksource_tsc.rating = 0; |
465 | 465 | ||
466 | init_timer(&verify_tsc_freq_timer); | 466 | init_timer(&verify_tsc_freq_timer); |
467 | verify_tsc_freq_timer.function = verify_tsc_freq; | 467 | verify_tsc_freq_timer.function = verify_tsc_freq; |
diff --git a/kernel/time/jiffies.c b/kernel/time/jiffies.c index 126bb30c4afe..a99b2a6e6a07 100644 --- a/kernel/time/jiffies.c +++ b/kernel/time/jiffies.c | |||
@@ -57,7 +57,7 @@ static cycle_t jiffies_read(void) | |||
57 | 57 | ||
58 | struct clocksource clocksource_jiffies = { | 58 | struct clocksource clocksource_jiffies = { |
59 | .name = "jiffies", | 59 | .name = "jiffies", |
60 | .rating = 0, /* lowest rating*/ | 60 | .rating = 1, /* lowest valid rating*/ |
61 | .read = jiffies_read, | 61 | .read = jiffies_read, |
62 | .mask = 0xffffffff, /*32bits*/ | 62 | .mask = 0xffffffff, /*32bits*/ |
63 | .mult = NSEC_PER_JIFFY << JIFFIES_SHIFT, /* details above */ | 63 | .mult = NSEC_PER_JIFFY << JIFFIES_SHIFT, /* details above */ |