From 1f5014e0d9c11ffc2b7a37e1209ed5e7be844e08 Mon Sep 17 00:00:00 2001
From: Christoph Lameter <clameter@sgi.com>
Date: Wed, 1 Aug 2007 12:37:17 -0700
Subject: [PATCH] --- yaml --- r: 63561 b: refs/heads/master c:
 40d485753423b87239cc16b6c8141ef8792324d9 h: refs/heads/master i:   63559:
 c60420ffbd85796e92b297a335bc1704c7e9d78b v: v3

---
 [refs]                                | 2 +-
 trunk/arch/ia64/sn/kernel/sn2/timer.c | 7 ++-----
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 2736dd41eac6..186af246225b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 224685c0d1ca5970364c9f5d4f21ea1aa64c381e
+refs/heads/master: 40d485753423b87239cc16b6c8141ef8792324d9
diff --git a/trunk/arch/ia64/sn/kernel/sn2/timer.c b/trunk/arch/ia64/sn/kernel/sn2/timer.c
index 19e25d2b64fc..cf67fc562054 100644
--- a/trunk/arch/ia64/sn/kernel/sn2/timer.c
+++ b/trunk/arch/ia64/sn/kernel/sn2/timer.c
@@ -23,16 +23,14 @@
 
 extern unsigned long sn_rtc_cycles_per_second;
 
-static void __iomem *sn2_mc;
-
 static cycle_t read_sn2(void)
 {
-	return (cycle_t)readq(sn2_mc);
+	return (cycle_t)readq(RTC_COUNTER_ADDR);
 }
 
 static struct clocksource clocksource_sn2 = {
         .name           = "sn2_rtc",
-        .rating         = 300,
+        .rating         = 450,
         .read           = read_sn2,
         .mask           = (1LL << 55) - 1,
         .mult           = 0,
@@ -58,7 +56,6 @@ ia64_sn_udelay (unsigned long usecs)
 
 void __init sn_timer_init(void)
 {
-	sn2_mc = RTC_COUNTER_ADDR;
 	clocksource_sn2.fsys_mmio = RTC_COUNTER_ADDR;
 	clocksource_sn2.mult = clocksource_hz2mult(sn_rtc_cycles_per_second,
 							clocksource_sn2.shift);