Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
---
 arch/arm/plat-iop/time.c |   22 +---------------------
 1 file changed, 1 insertion(+), 21 deletions(-)

Index: linux-2.6-tip/arch/arm/plat-iop/time.c
===================================================================
--- linux-2.6-tip.orig/arch/arm/plat-iop/time.c
+++ linux-2.6-tip/arch/arm/plat-iop/time.c
@@ -25,7 +25,6 @@
 #include <linux/clockchips.h>
 #include <mach/hardware.h>
 #include <asm/irq.h>
-#include <asm/sched_clock.h>
 #include <asm/uaccess.h>
 #include <asm/mach/irq.h>
 #include <asm/mach/time.h>
@@ -49,26 +48,9 @@ static struct clocksource iop_clocksourc
 	.rating		= 300,
 	.read		= iop_clocksource_read,
 	.mask		= CLOCKSOURCE_MASK(32),
-	.flags		= CLOCK_SOURCE_IS_CONTINUOUS,
+	.flags		= CLOCK_SOURCE_IS_CONTINUOUS | CLOCK_SOURCE_SCHED_CLOCK,
 };
 
-static DEFINE_CLOCK_DATA(cd);
-
-/*
- * IOP sched_clock() implementation via its clocksource.
- */
-unsigned long long notrace sched_clock(void)
-{
-	u32 cyc = 0xffffffffu - read_tcr1();
-	return cyc_to_sched_clock(&cd, cyc, (u32)~0);
-}
-
-static void notrace iop_update_sched_clock(void)
-{
-	u32 cyc = 0xffffffffu - read_tcr1();
-	update_sched_clock(&cd, cyc, (u32)~0);
-}
-
 /*
  * IOP clockevents (interrupting timer 0).
  */
@@ -152,8 +134,6 @@ void __init iop_init_time(unsigned long 
 {
 	u32 timer_ctl;
 
-	init_sched_clock(&cd, iop_update_sched_clock, 32, tick_rate);
-
 	ticks_per_jiffy = DIV_ROUND_CLOSEST(tick_rate, HZ);
 	iop_tick_rate = tick_rate;