projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'x86-debug-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[cascardo/linux.git]
/
drivers
/
clocksource
/
timer-prima2.c
diff --git
a/drivers/clocksource/timer-prima2.c
b/drivers/clocksource/timer-prima2.c
index
78de982
..
2854c66
100644
(file)
--- a/
drivers/clocksource/timer-prima2.c
+++ b/
drivers/clocksource/timer-prima2.c
@@
-73,7
+73,7
@@
static irqreturn_t sirfsoc_timer_interrupt(int irq, void *dev_id)
}
/* read 64-bit timer counter */
-static cycle_t sirfsoc_timer_read(struct clocksource *cs)
+static cycle_t
notrace
sirfsoc_timer_read(struct clocksource *cs)
{
u64 cycles;