projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[linux-2.6-block.git]
/
drivers
/
clocksource
/
arm_global_timer.c
diff --git
a/drivers/clocksource/arm_global_timer.c
b/drivers/clocksource/arm_global_timer.c
index bbfeb2800a94a582b52d5ffe57381cbc5dba72fa..123ed20ac2ffd406a4e9225ae0a23909066a2f1b 100644
(file)
--- a/
drivers/clocksource/arm_global_timer.c
+++ b/
drivers/clocksource/arm_global_timer.c
@@
-195,7
+195,7
@@
static int gt_dying_cpu(unsigned int cpu)
return 0;
}
-static
cycle_t
gt_clocksource_read(struct clocksource *cs)
+static
u64
gt_clocksource_read(struct clocksource *cs)
{
return gt_counter_read();
}