Messages in this thread Patch in this message | | | From | Wanlong Gao <> | Subject | [PATCH] xtensa:fix the incompatible pointer type warning in time.c | Date | Wed, 1 Jun 2011 22:37:43 +0800 |
| |
Fix the definition of the function ccount_read to be compatible to the member read of the structure clocksource.
Signed-off-by: Wanlong Gao <wanlong.gao@gmail.com> --- arch/xtensa/kernel/time.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/arch/xtensa/kernel/time.c b/arch/xtensa/kernel/time.c index f3e5eb4..db18807 100644 --- a/arch/xtensa/kernel/time.c +++ b/arch/xtensa/kernel/time.c @@ -31,7 +31,7 @@ unsigned long ccount_per_jiffy; /* per 1/HZ */ unsigned long nsec_per_ccount; /* nsec per ccount increment */ #endif -static cycle_t ccount_read(void) +static cycle_t ccount_read(struct clocksource *cs) { return (cycle_t)get_ccount(); } -- 1.7.4.1
| |