Messages in this thread Patch in this message | | | Date | Mon, 19 Mar 2012 18:28:57 +0100 | From | Ingo Molnar <> | Subject | [GIT PULL] x86/uv change for v3.4 |
| |
Linus,
Please pull the latest x86-uv-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86-uv-for-linus
HEAD: b0deca2e0270135f797e81bdb0743e50fd1dc58d x86/UV: Lower UV rtc clocksource rating
Thanks,
Ingo
------------------> Dimitri Sivanich (1): x86/UV: Lower UV rtc clocksource rating
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 9f29a01..5032e0d 100644 --- a/arch/x86/platform/uv/uv_time.c +++ b/arch/x86/platform/uv/uv_time.c @@ -37,7 +37,7 @@ static void uv_rtc_timer_setup(enum clock_event_mode, static struct clocksource clocksource_uv = { .name = RTC_NAME, - .rating = 400, + .rating = 299, .read = uv_read_rtc, .mask = (cycle_t)UVH_RTC_REAL_TIME_CLOCK_MASK, .flags = CLOCK_SOURCE_IS_CONTINUOUS, @@ -379,10 +379,6 @@ static __init int uv_rtc_setup_clock(void) if (!is_uv_system()) return -ENODEV; - /* If single blade, prefer tsc */ - if (uv_num_possible_blades() == 1) - clocksource_uv.rating = 250; - rc = clocksource_register_hz(&clocksource_uv, sn_rtc_cycles_per_second); if (rc) printk(KERN_INFO "UV RTC clocksource failed rc %d\n", rc);
| |