1 files changed, 6 insertions, 11 deletions

diff --git a/arch/x86/kernel/uv_time.c b/arch/x86/kernel/uv_time.c
index 3da7b1d8bfd3..3c84aa001c11 100644
--- a/arch/x86/kernel/uv_time.c
+++ b/arch/x86/kernel/uv_time.c
@@ -74,7 +74,6 @@ struct uv_rtc_timer_head {
  */
 static struct uv_rtc_timer_head         **blade_info __read_mostly;
 
-static int                              uv_rtc_enable;
 static int                              uv_rtc_evt_enable;
 
 /*
@@ -335,14 +334,6 @@ static void uv_rtc_interrupt(void)
         ced->event_handler(ced);
 }
 
-static int __init uv_enable_rtc(char *str)
-{
-        uv_rtc_enable = 1;
-
-        return 1;
-}
-__setup("uvrtc", uv_enable_rtc);
-
 static int __init uv_enable_evt_rtc(char *str)
 {
         uv_rtc_evt_enable = 1;
@@ -364,12 +355,16 @@ static __init int uv_rtc_setup_clock(void)
 {
         int rc;
 
-        if (!uv_rtc_enable || !is_uv_system() || x86_platform_ipi_callback)
+        if (!is_uv_system())
                 return -ENODEV;
 
         clocksource_uv.mult = clocksource_hz2mult(sn_rtc_cycles_per_second,
                                 clocksource_uv.shift);
 
+        /* If single blade, prefer tsc */
+        if (uv_num_possible_blades() == 1)
+                clocksource_uv.rating = 250;
+
         rc = clocksource_register(&clocksource_uv);
         if (rc)
                 printk(KERN_INFO "UV RTC clocksource failed rc %d\n", rc);
@@ -377,7 +372,7 @@ static __init int uv_rtc_setup_clock(void)
                 printk(KERN_INFO "UV RTC clocksource registered freq %lu MHz\n",
                         sn_rtc_cycles_per_second/(unsigned long)1E6);
 
-        if (rc || !uv_rtc_evt_enable)
+        if (rc || !uv_rtc_evt_enable || x86_platform_ipi_callback)
                 return rc;
 
         /* Setup and register clockevents */