diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-19 20:44:13 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-19 20:44:13 -0400 |
| commit | 0f1bdc1815c4cb29b3cd71a7091b478e426faa0b (patch) | |
| tree | b4d70c6a305d91bf7d1c8a6bbf87508587d55633 /arch/x86/platform | |
| parent | 80fe02b5daf176f99d3afc8f6c9dc9dece019836 (diff) | |
| parent | a18f22a968de17b29f2310cdb7ba69163e65ec15 (diff) | |
Merge branch 'timers-clocksource-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'timers-clocksource-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
clocksource: convert mips to generic i8253 clocksource
clocksource: convert x86 to generic i8253 clocksource
clocksource: convert footbridge to generic i8253 clocksource
clocksource: add common i8253 PIT clocksource
blackfin: convert to clocksource_register_hz
mips: convert to clocksource_register_hz/khz
sparc: convert to clocksource_register_hz/khz
alpha: convert to clocksource_register_hz
microblaze: convert to clocksource_register_hz/khz
ia64: convert to clocksource_register_hz/khz
x86: Convert remaining x86 clocksources to clocksource_register_hz/khz
Make clocksource name const
Diffstat (limited to 'arch/x86/platform')
| -rw-r--r-- | arch/x86/platform/uv/uv_time.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/arch/x86/platform/uv/uv_time.c b/arch/x86/platform/uv/uv_time.c index 9daf5d1af9f1..0eb90184515f 100644 --- a/arch/x86/platform/uv/uv_time.c +++ b/arch/x86/platform/uv/uv_time.c | |||
| @@ -40,7 +40,6 @@ static struct clocksource clocksource_uv = { | |||
| 40 | .rating = 400, | 40 | .rating = 400, |
| 41 | .read = uv_read_rtc, | 41 | .read = uv_read_rtc, |
| 42 | .mask = (cycle_t)UVH_RTC_REAL_TIME_CLOCK_MASK, | 42 | .mask = (cycle_t)UVH_RTC_REAL_TIME_CLOCK_MASK, |
| 43 | .shift = 10, | ||
| 44 | .flags = CLOCK_SOURCE_IS_CONTINUOUS, | 43 | .flags = CLOCK_SOURCE_IS_CONTINUOUS, |
| 45 | }; | 44 | }; |
| 46 | 45 | ||
| @@ -372,14 +371,11 @@ static __init int uv_rtc_setup_clock(void) | |||
| 372 | if (!is_uv_system()) | 371 | if (!is_uv_system()) |
| 373 | return -ENODEV; | 372 | return -ENODEV; |
| 374 | 373 | ||
| 375 | clocksource_uv.mult = clocksource_hz2mult(sn_rtc_cycles_per_second, | ||
| 376 | clocksource_uv.shift); | ||
| 377 | |||
| 378 | /* If single blade, prefer tsc */ | 374 | /* If single blade, prefer tsc */ |
| 379 | if (uv_num_possible_blades() == 1) | 375 | if (uv_num_possible_blades() == 1) |
| 380 | clocksource_uv.rating = 250; | 376 | clocksource_uv.rating = 250; |
| 381 | 377 | ||
| 382 | rc = clocksource_register(&clocksource_uv); | 378 | rc = clocksource_register_hz(&clocksource_uv, sn_rtc_cycles_per_second); |
| 383 | if (rc) | 379 | if (rc) |
| 384 | printk(KERN_INFO "UV RTC clocksource failed rc %d\n", rc); | 380 | printk(KERN_INFO "UV RTC clocksource failed rc %d\n", rc); |
| 385 | else | 381 | else |