From e326e3619ec7620c981fff5a87e90dc6209185cb Mon Sep 17 00:00:00 2001
From: Hidetoshi Seto <seto.hidetoshi@jp.fujitsu.com>
Date: Wed, 30 Apr 2008 16:50:43 +0900
Subject: [PATCH] --- yaml --- r: 95746 b: refs/heads/master c:
 751fc7849d623bcd5e77fd494b01662599a8dccf h: refs/heads/master v: v3

---
 [refs]                        | 2 +-
 trunk/arch/ia64/kernel/irq.c  | 4 ++--
 trunk/arch/ia64/kernel/time.c | 5 -----
 3 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index 2e06327c5959..cc8ce74808df 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c5b5a5993234d4db2079e57e456bda5278ef59cf
+refs/heads/master: 751fc7849d623bcd5e77fd494b01662599a8dccf
diff --git a/trunk/arch/ia64/kernel/irq.c b/trunk/arch/ia64/kernel/irq.c
index 6dee579f205f..7fd18f54c056 100644
--- a/trunk/arch/ia64/kernel/irq.c
+++ b/trunk/arch/ia64/kernel/irq.c
@@ -183,10 +183,10 @@ void fixup_irqs(void)
 {
 	unsigned int irq;
 	extern void ia64_process_pending_intr(void);
-	extern void ia64_disable_timer(void);
 	extern volatile int time_keeper_id;
 
-	ia64_disable_timer();
+	/* Mask ITV to disable timer */
+	ia64_set_itv(1 << 16);
 
 	/*
 	 * Find a new timesync master
diff --git a/trunk/arch/ia64/kernel/time.c b/trunk/arch/ia64/kernel/time.c
index 48e15a51782f..8c73643f2d66 100644
--- a/trunk/arch/ia64/kernel/time.c
+++ b/trunk/arch/ia64/kernel/time.c
@@ -379,11 +379,6 @@ static struct irqaction timer_irqaction = {
 	.name =		"timer"
 };
 
-void __devinit ia64_disable_timer(void)
-{
-	ia64_set_itv(1 << 16);
-}
-
 void __init
 time_init (void)
 {