After the patch to add parameter to uv_read_rtc(), I did a grep and found
several similar issues.
This patch modifies parameter of clksrc_read() from 'void' to 'struct
clocksource *cs', which fixes compile warning for incompatible parameter type.
Signed-off-by: Coly Li <[email protected]>
Cc: Eric Miao <[email protected]>
Cc: Ingo Molnar <[email protected]>
---
arch/arm/mach-mmp/time.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/arch/arm/mach-mmp/time.c b/arch/arm/mach-mmp/time.c
index b03a6ed..a8400bb 100644
--- a/arch/arm/mach-mmp/time.c
+++ b/arch/arm/mach-mmp/time.c
@@ -136,7 +136,7 @@ static struct clock_event_device ckevt = {
.set_mode = timer_set_mode,
};
-static cycle_t clksrc_read(void)
+static cycle_t clksrc_read(struct clocksource *cs)
{
return timer_read();
}
--
Coly Li
SuSE Labs
This looks to be already fixed by Magnus Damm and merged in recent -rc3.
On Thu, Apr 23, 2009 at 3:04 AM, Coly Li <[email protected]> wrote:
> After the patch to add parameter to uv_read_rtc(), I did a grep and found
> several similar issues.
>
> This patch modifies parameter of clksrc_read() from 'void' to 'struct
> clocksource *cs', which fixes compile warning for incompatible parameter type.
>
> Signed-off-by: Coly Li <[email protected]>
> Cc: Eric Miao <[email protected]>
> Cc: Ingo Molnar <[email protected]>
> ---
> arch/arm/mach-mmp/time.c | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/arch/arm/mach-mmp/time.c b/arch/arm/mach-mmp/time.c
> index b03a6ed..a8400bb 100644
> --- a/arch/arm/mach-mmp/time.c
> +++ b/arch/arm/mach-mmp/time.c
> @@ -136,7 +136,7 @@ static struct clock_event_device ckevt = {
> .set_mode = timer_set_mode,
> };
>
> -static cycle_t clksrc_read(void)
> +static cycle_t clksrc_read(struct clocksource *cs)
> {
> return timer_read();
> }
>
> --
> Coly Li
> SuSE Labs
>
>
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to [email protected]
> More majordomo info at http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at http://www.tux.org/lkml/
>
--
Cheers
- eric
Eric Miao Wrote:
> This looks to be already fixed by Magnus Damm and merged in recent -rc3.
>
>From my upstream clone, the last commit is
49cbe78637eb0503f45fc9b556ec08918a616534, which is
[ARM] pxa: add base support for Marvell's PXA168 processor line
I don't find Magnus' patch from upstream. Is that patch already merged in some
sub-system tree ?
> On Thu, Apr 23, 2009 at 3:04 AM, Coly Li <[email protected]> wrote:
>> After the patch to add parameter to uv_read_rtc(), I did a grep and found
>> several similar issues.
>>
>> This patch modifies parameter of clksrc_read() from 'void' to 'struct
>> clocksource *cs', which fixes compile warning for incompatible parameter type.
>>
>> Signed-off-by: Coly Li <[email protected]>
>> Cc: Eric Miao <[email protected]>
>> Cc: Ingo Molnar <[email protected]>
>> ---
>> arch/arm/mach-mmp/time.c | 2 +-
>> 1 files changed, 1 insertions(+), 1 deletions(-)
>>
>> diff --git a/arch/arm/mach-mmp/time.c b/arch/arm/mach-mmp/time.c
>> index b03a6ed..a8400bb 100644
>> --- a/arch/arm/mach-mmp/time.c
>> +++ b/arch/arm/mach-mmp/time.c
>> @@ -136,7 +136,7 @@ static struct clock_event_device ckevt = {
>> .set_mode = timer_set_mode,
>> };
>>
>> -static cycle_t clksrc_read(void)
>> +static cycle_t clksrc_read(struct clocksource *cs)
>> {
>> return timer_read();
>> }
>>
>> --
>> Coly Li
>> SuSE Labs
>>
>>
>>
>> --
>> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
>> the body of a message to [email protected]
>> More majordomo info at http://vger.kernel.org/majordomo-info.html
>> Please read the FAQ at http://www.tux.org/lkml/
>>
>
>
>
--
Coly Li
SuSE Labs
On Thu, Apr 23, 2009 at 4:37 PM, Coly Li <[email protected]> wrote:
>
>
> Eric Miao Wrote:
>> This looks to be already fixed by Magnus Damm and merged in recent -rc3.
>>
>
> From my upstream clone, the last commit is
> 49cbe78637eb0503f45fc9b556ec08918a616534, which is
> [ARM] pxa: add base support for Marvell's PXA168 processor line
>
> I don't find Magnus' patch from upstream. Is that patch already merged in some
> sub-system tree ?
>
Sorry, I overlooked it and mistook it with arch/arm/mach-pxa/,
so yes, you have my Ack on this:
Acked-by: Eric Miao <[email protected]>