projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'tty-4.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
clocksource
/
timer-digicolor.c
diff --git
a/drivers/clocksource/timer-digicolor.c
b/drivers/clocksource/timer-digicolor.c
index e73947f0f86db3c1b9656c9b3418c9151f7f2954..a536eeb634d885fccf5b92f0d0cbeeec7f88baf2 100644
(file)
--- a/
drivers/clocksource/timer-digicolor.c
+++ b/
drivers/clocksource/timer-digicolor.c
@@
-143,7
+143,7
@@
static irqreturn_t digicolor_timer_interrupt(int irq, void *dev_id)
return IRQ_HANDLED;
}
return IRQ_HANDLED;
}
-static u64 digicolor_timer_sched_read(void)
+static u64
notrace
digicolor_timer_sched_read(void)
{
return ~readl(dc_timer_dev.base + COUNT(TIMER_B));
}
{
return ~readl(dc_timer_dev.base + COUNT(TIMER_B));
}