2009-04-22 19:12:17

by Coly Li

Subject: [PATCH 7/7] xtensa: add parameter to 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

2009-04-22 22:09:04

by Johannes Weiner

Subject: Re: [PATCH 7/7] xtensa: add parameter to ccount_read()

On Thu, Apr 23, 2009 at 03:12:22AM +0800, Coly Li wrote:
> This patch modifies parameter of au1x_counter1_read() from 'void' to 'struct
> clocksource *cs', which fixes compile warning for incompatible parameter type.

Changelog should be adjusted to say 'ccount_read()' here ;)

> 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();
> }

Thanks. Copied Chris as well.

2009-04-23 04:36:00

by Coly Li

Subject: Re: [PATCH 7/7] xtensa: add parameter to ccount_read()

Johannes Weiner Wrote:
> On Thu, Apr 23, 2009 at 03:12:22AM +0800, Coly Li wrote:
>> This patch modifies parameter of au1x_counter1_read() from 'void' to 'struct
>> clocksource *cs', which fixes compile warning for incompatible parameter type.
>
> Changelog should be adjusted to say 'ccount_read()' here ;)
>

Obviously this is a copy+past mistake. I modified the email title, but missed
the changelog :(

>> 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();
>> }
>
> Thanks. Copied Chris as well.

Need I resend another patch which fixes the changelog ?

Thanks.
--
Coly Li
SuSE Labs