diff options
| author | Dmitry Torokhov <dtor@insightbb.com> | 2006-11-04 22:42:39 -0500 |
|---|---|---|
| committer | Dmitry Torokhov <dtor@insightbb.com> | 2006-11-04 22:42:39 -0500 |
| commit | 752c58a471c108d64da1676b2925dfbd83eb177e (patch) | |
| tree | fbffa0d7c54cd812950dffc16d642c9d449f4faf /arch/i386/kernel/tsc.c | |
| parent | e52b29c2a637f6854d71a45646d7283d984a6dad (diff) | |
| parent | 10b1fbdb0a0ca91847a534ad26d0bc250c25b74f (diff) | |
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'arch/i386/kernel/tsc.c')
| -rw-r--r-- | arch/i386/kernel/tsc.c | 6 |
1 files changed, 3 insertions, 3 deletions
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; |