2009-04-22 19:07:00

by Coly Li

[permalink] [raw]
Subject: [PATCH 7/7] xtensa: ccount_read()

This patch modifies parameter of au1x_counter1_read() from 'void' to 'struct
clocksource *cs', which fixes compile warning for incompatible parameter type.

Signed-off-by: Coly Li <[email protected]>
Cc: Johannes Weiner <[email protected]>
Cc: Ingo Molnar <[email protected]>
---
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 8848120..9638641 100644
--- a/arch/xtensa/kernel/time.c
+++ b/arch/xtensa/kernel/time.c
@@ -30,7 +30,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();
}

--
Coly Li
SuSE Labs