From 5fd78d5a4106915718e422a86814920abe1a2b6a Mon Sep 17 00:00:00 2001
From: Thomas Gleixner <tglx@linutronix.de>
Date: Thu, 20 Aug 2009 18:19:45 +0200
Subject: [PATCH] --- yaml --- r: 163074 b: refs/heads/master c:
 8cab02dc3c58a12235c6d463ce684dded9696848 h: refs/heads/master v: v3

---
 [refs]                        |  2 +-
 trunk/arch/x86/kernel/i8253.c | 19 -------------------
 2 files changed, 1 insertion(+), 20 deletions(-)

diff --git a/[refs] b/[refs]
index db1d43c60bf0..026f7f6ffaf8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 01548f4d3e8e94caf323a4f664eb347fd34a34ab
+refs/heads/master: 8cab02dc3c58a12235c6d463ce684dded9696848
diff --git a/trunk/arch/x86/kernel/i8253.c b/trunk/arch/x86/kernel/i8253.c
index 5cf36c053ac4..23c167925a5c 100644
--- a/trunk/arch/x86/kernel/i8253.c
+++ b/trunk/arch/x86/kernel/i8253.c
@@ -19,12 +19,6 @@
 DEFINE_SPINLOCK(i8253_lock);
 EXPORT_SYMBOL(i8253_lock);
 
-#ifdef CONFIG_X86_32
-static void pit_disable_clocksource(void);
-#else
-static inline void pit_disable_clocksource(void) { }
-#endif
-
 /*
  * HPET replaces the PIT, when enabled. So we need to know, which of
  * the two timers is used
@@ -57,12 +51,10 @@ static void init_pit_timer(enum clock_event_mode mode,
 			outb_pit(0, PIT_CH0);
 			outb_pit(0, PIT_CH0);
 		}
-		pit_disable_clocksource();
 		break;
 
 	case CLOCK_EVT_MODE_ONESHOT:
 		/* One shot setup */
-		pit_disable_clocksource();
 		outb_pit(0x38, PIT_MODE);
 		break;
 
@@ -200,17 +192,6 @@ static struct clocksource pit_cs = {
 	.shift		= 20,
 };
 
-static void pit_disable_clocksource(void)
-{
-	/*
-	 * Use mult to check whether it is registered or not
-	 */
-	if (pit_cs.mult) {
-		clocksource_unregister(&pit_cs);
-		pit_cs.mult = 0;
-	}
-}
-
 static int __init init_pit_clocksource(void)
 {
 	 /*