summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorRoshni Shah <roshni.shah@timesys.com>2013-03-10 20:39:34 -0400
committerEd Nash <ed@kidlearn.com>2013-03-10 20:39:34 -0400
commit4cbca527d4ab6175ec14887b99e88a70c6b34621 (patch)
tree6a644bc1dfc50926a4ba42375473bb1c07f9da6f /arch
parentb23b7cd0cff8242e023b6b5b8fe005ba68e3caa3 (diff)
fix scheduler not seeing time pass, would not interrupt cpu bound process
Signed-off-by: Ed Nash <ed@kidlearn.com>
Diffstat (limited to 'arch')
-rwxr-xr-xarch/arm/plat-mxc/Makefile4
-rw-r--r--arch/arm/plat-mxc/pit.c6
2 files changed, 9 insertions, 1 deletions
diff --git a/arch/arm/plat-mxc/Makefile b/arch/arm/plat-mxc/Makefile
index e2abb624f9d1..238788df23da 100755
--- a/arch/arm/plat-mxc/Makefile
+++ b/arch/arm/plat-mxc/Makefile
@@ -3,12 +3,14 @@
#
# Common support
-obj-y := clock.o time.o devices.o cpu.o system.o irq-common.o usb_common.o usb_wakeup.o
+#obj-y := clock.o time.o devices.o cpu.o system.o irq-common.o usb_common.o usb_wakeup.o
+obj-y := clock.o devices.o cpu.o system.o irq-common.o usb_common.o usb_wakeup.o
ifdef CONFIG_ARCH_MVF
obj-y += gpio-mvf.o
else
obj-y += gpio.o
+obj-y += time.o
endif
# MX51 uses the TZIC interrupt controller, older platforms use AVIC
diff --git a/arch/arm/plat-mxc/pit.c b/arch/arm/plat-mxc/pit.c
index ba71bda51c06..e82cca9d06ea 100644
--- a/arch/arm/plat-mxc/pit.c
+++ b/arch/arm/plat-mxc/pit.c
@@ -90,6 +90,12 @@ static cycle_t pit_read_clk(struct clocksource *cs);
static DEFINE_CLOCK_DATA(cd);
static void __iomem *sched_clock_reg;
+unsigned long long notrace sched_clock(void)
+{
+ cycle_t cyc = sched_clock_reg ? ((u32)~0
+ - __raw_readl(sched_clock_reg)) : 0;
+ return cyc_to_sched_clock(&cd, cyc, (u32)~0);
+}
static void notrace mvf_update_sched_clock(void)
{