From e9a22c726b266529ef694fbe1a65d3283f1e7377 Mon Sep 17 00:00:00 2001 From: Dimitri Sivanich Date: Fri, 17 Feb 2012 08:16:41 -0600 Subject: [PATCH] --- yaml --- r: 292723 b: refs/heads/master c: b0deca2e0270135f797e81bdb0743e50fd1dc58d h: refs/heads/master i: 292721: 5b0f4b8f0db2b408b3f149b6e849fd56d4c4c75b 292719: e3d7f54a774b57ee379b0021c8f0b91e29716162 v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/process_64.c | 1 - trunk/arch/x86/platform/uv/uv_time.c | 6 +----- 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 80a074f4bd49..1a6bcc6f8ec7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 42dfc43ee5999ac64284476ea0ac6c937587cf2b +refs/heads/master: b0deca2e0270135f797e81bdb0743e50fd1dc58d diff --git a/trunk/arch/x86/kernel/process_64.c b/trunk/arch/x86/kernel/process_64.c index eb54dd0fbed6..1fd94bc4279d 100644 --- a/trunk/arch/x86/kernel/process_64.c +++ b/trunk/arch/x86/kernel/process_64.c @@ -341,7 +341,6 @@ start_thread_common(struct pt_regs *regs, unsigned long new_ip, loadsegment(es, _ds); loadsegment(ds, _ds); load_gs_index(0); - current->thread.usersp = new_sp; regs->ip = new_ip; regs->sp = new_sp; percpu_write(old_rsp, new_sp); diff --git a/trunk/arch/x86/platform/uv/uv_time.c b/trunk/arch/x86/platform/uv/uv_time.c index 9f29a01ee1b3..5032e0d19b86 100644 --- a/trunk/arch/x86/platform/uv/uv_time.c +++ b/trunk/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);