[3.11.y.z extended stable] Patch "clocksource: dw_apb_timer_of: Fix read_sched_clock" has been added to staging queue
Luis Henriques
luis.henriques at canonical.com
Thu Jan 9 12:04:50 UTC 2014
This is a note to let you know that I have just added a patch titled
clocksource: dw_apb_timer_of: Fix read_sched_clock
to the linux-3.11.y-queue branch of the 3.11.y.z extended stable tree
which can be found at:
http://kernel.ubuntu.com/git?p=ubuntu/linux.git;a=shortlog;h=refs/heads/linux-3.11.y-queue
If you, or anyone else, feels it should not be added to this tree, please
reply to this email.
For more information about the 3.11.y.z tree, see
https://wiki.ubuntu.com/Kernel/Dev/ExtendedStable
Thanks.
-Luis
------
>From 2665cd364be790023a95234184f6e9bbee5215de Mon Sep 17 00:00:00 2001
From: Dinh Nguyen <dinguyen at altera.com>
Date: Tue, 10 Dec 2013 19:49:18 +0100
Subject: clocksource: dw_apb_timer_of: Fix read_sched_clock
commit 85dc6ee1237c8a4a7742e6abab96a20389b7d682 upstream.
The read_sched_clock should return the ~value because the clock is a
countdown implementation. read_sched_clock() should be the same as
__apbt_read_clocksource().
Signed-off-by: Dinh Nguyen <dinguyen at altera.com>
Signed-off-by: Daniel Lezcano <daniel.lezcano at linaro.org>
Signed-off-by: Luis Henriques <luis.henriques at canonical.com>
---
drivers/clocksource/dw_apb_timer_of.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/clocksource/dw_apb_timer_of.c b/drivers/clocksource/dw_apb_timer_of.c
index 4cbae4f..33fd4ff 100644
--- a/drivers/clocksource/dw_apb_timer_of.c
+++ b/drivers/clocksource/dw_apb_timer_of.c
@@ -108,7 +108,7 @@ static void add_clocksource(struct device_node *source_timer)
static u32 read_sched_clock(void)
{
- return __raw_readl(sched_io_base);
+ return ~__raw_readl(sched_io_base);
}
static const struct of_device_id sptimer_ids[] __initconst = {
--
1.8.3.2
More information about the kernel-team
mailing list