Commit-ID: 8c28de4d011f37b2893ecfcec9a985c0e9bd786f
Gitweb: http://git.kernel.org/tip/8c28de4d011f37b2893ecfcec9a985c0e9bd786f
Author: Dimitri Sivanich <sivanich@xxxxxxx>
AuthorDate: Wed, 14 Oct 2009 09:18:48 -0500
Committer: Ingo Molnar <mingo@xxxxxxx>
CommitDate: Wed, 14 Oct 2009 18:27:10 +0200
x86: UV RTC: Add clocksource only boot option
Add clocksource only boot option for UV RTC.
Signed-off-by: Dimitri Sivanich <sivanich@xxxxxxx>
LKML-Reference: <20091014141848.GC11048@xxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
---
arch/x86/kernel/uv_time.c | 23 ++++++++++++++++++-----
1 files changed, 18 insertions(+), 5 deletions(-)
diff --git a/arch/x86/kernel/uv_time.c b/arch/x86/kernel/uv_time.c
index ec14889..c6324ad 100644
--- a/arch/x86/kernel/uv_time.c
+++ b/arch/x86/kernel/uv_time.c
@@ -75,6 +75,7 @@ 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;
/*
* Hardware interface routines
@@ -342,6 +343,14 @@ static int __init uv_enable_rtc(char *str)
}
__setup("uvrtc", uv_enable_rtc);
+static int __init uv_enable_evt_rtc(char *str)
+{
+ uv_rtc_evt_enable = 1;
+
+ return 1;
+}
+__setup("uvrtcevt", uv_enable_evt_rtc);
+
static __init void uv_rtc_register_clockevents(struct work_struct *dummy)
{
struct clock_event_device *ced = &__get_cpu_var(cpu_ced);
@@ -358,16 +367,20 @@ static __init int uv_rtc_setup_clock(void)
if (!uv_rtc_enable || !is_uv_system() || generic_interrupt_extension)
return -ENODEV;
- generic_interrupt_extension = uv_rtc_interrupt;
-
clocksource_uv.mult = clocksource_hz2mult(sn_rtc_cycles_per_second,
clocksource_uv.shift);
rc = clocksource_register(&clocksource_uv);
- if (rc) {
- generic_interrupt_extension = NULL;
+ if (rc)
+ printk(KERN_INFO "UV RTC clocksource failed rc %d\n", rc);
+ else
+ 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)
return rc;
- }
+
+ generic_interrupt_extension = uv_rtc_interrupt;
/* Setup and register clockevents */
rc = uv_rtc_allocate_timers();
--
To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
|