From 0a4936ed158719247ae3b9e9f4693c8cbe1fe856 Mon Sep 17 00:00:00 2001
From: Ralf Baechle <ralf@linux-mips.org>
Date: Thu, 18 Oct 2007 16:00:19 +0100
Subject: [PATCH] --- yaml --- r: 71311 b: refs/heads/master c:
 2cfa7660dbf94a61b9d43edaa84be454f9dc25fc h: refs/heads/master i:   71309:
 56ee50e8035ea34d8ca78a63e3855ff07dfcc09b   71307:
 86bbafaf715f7b9b5d286dd8c234e14ae77e7965   71303:
 1ce8c50866df814d6c565a91a8ffd1a7c0bc2ba4   71295:
 c6f116d09a690d0eb2fb746ed8b07da862fdb83b v: v3

---
 [refs]                        |  2 +-
 trunk/arch/mips/kernel/time.c | 21 ---------------------
 trunk/include/asm-mips/time.h |  1 -
 3 files changed, 1 insertion(+), 23 deletions(-)

diff --git a/[refs] b/[refs]
index b7a25badcbb0..45ab8c73f3cf 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 76d3a7a54cbd40c979d9914f53066ff67f8463f5
+refs/heads/master: 2cfa7660dbf94a61b9d43edaa84be454f9dc25fc
diff --git a/trunk/arch/mips/kernel/time.c b/trunk/arch/mips/kernel/time.c
index e4b5e647b142..abadb8cb77c0 100644
--- a/trunk/arch/mips/kernel/time.c
+++ b/trunk/arch/mips/kernel/time.c
@@ -72,14 +72,6 @@ int update_persistent_clock(struct timespec now)
 	return rtc_mips_set_mmss(now.tv_sec);
 }
 
-/* how many counter cycles in a jiffy */
-static unsigned long cycles_per_jiffy __read_mostly;
-
-/*
- * Null timer ack for systems not needing one (e.g. i8254).
- */
-static void null_timer_ack(void) { /* nothing */ }
-
 /*
  * Null high precision timer functions for systems lacking one.
  */
@@ -105,7 +97,6 @@ static cycle_t c0_hpt_read(void)
 }
 
 int (*mips_timer_state)(void);
-void (*mips_timer_ack)(void);
 
 /*
  * local_timer_interrupt() does profiling and process accounting
@@ -512,14 +503,6 @@ void __init time_init(void)
 		if (!clocksource_mips.read) {
 			/* No external high precision timer -- use R4k.  */
 			clocksource_mips.read = c0_hpt_read;
-
-			if (!mips_timer_state) {
-				/* No external timer interrupt -- use R4k.  */
-				mips_timer_ack = c0_timer_ack;
-				/* Calculate cache parameters.  */
-				cycles_per_jiffy =
-					(mips_hpt_frequency + HZ / 2) / HZ;
-			}
 		}
 		if (!mips_hpt_frequency)
 			mips_hpt_frequency = calibrate_hpt();
@@ -534,10 +517,6 @@ void __init time_init(void)
 #endif
 	}
 
-	if (!mips_timer_ack)
-		/* No timer interrupt ack (e.g. i8254).  */
-		mips_timer_ack = null_timer_ack;
-
 	/*
 	 * Call board specific timer interrupt setup.
 	 *
diff --git a/trunk/include/asm-mips/time.h b/trunk/include/asm-mips/time.h
index 35555bd5c52d..ff514b400924 100644
--- a/trunk/include/asm-mips/time.h
+++ b/trunk/include/asm-mips/time.h
@@ -40,7 +40,6 @@ extern int rtc_mips_set_mmss(unsigned long);
  * mips_timer_ack may be NULL if the interrupt is self-recoverable.
  */
 extern int (*mips_timer_state)(void);
-extern void (*mips_timer_ack)(void);
 
 /*
  * High precision timer clocksource.