mach-mmp: add parameter to clksrc_read()
Subsystems (3)
PATCH 1/7 mach-mmp: add parameter to clksrc_read()
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.
--- arch/arm/mach-mmp/time.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
arch/arm/mach-mmp/time.c +1 -1
@@ -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 (); }
Signature · 2 lines
Coly Li SuSE Labs
This looks to be already fixed by Magnus Damm and merged in recent -rc3.
Quoted 39 lines · Coly Li
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(-)arch/arm/mach-mmp/time.c +1
-2@@ -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/
Signature · 2 lines
Cheers - eric
Eric Miao Wrote:
Quoted 4 lines
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 ?
Quoted 43 lines · Coly Li
Quoted 39 lines
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(-)arch/arm/mach-mmp/time.c +1
-2@@ -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/
Signature · 2 lines
Coly Li SuSE Labs
Eric Miao
Acked-byQuoted 6 lines · Coly Li
Eric Miao Wrote:
Quoted 2 lines
This looks to be already fixed by Magnus Damm and merged in recent -rc3.
Quoted 7 lines
From my upstream clone, the last commit is
49cbe78637eb0503f45fc9b556ec08918a616534, which is [ARM] pxa: add base support for Marvell's PXA168 processor lineI 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: