Skip to contentSkip to conversation

xtensa: add parameter to ccount_read()

PATCH Applied Coly Li 2 participants 3 messages Apr 22, 2009 – Apr 23, 2009 Tensilica Xtensa port (xtensa)

lore
Share & tools
lore

Coly Li

author
#0 lore raw

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(-)
arch/xtensa/kernel/time.c +1 -1
index 8848120..9638641 100644
@@ -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();
 }
Signature · 2 lines
Coly Li
SuSE Labs
#1 lore raw
Quoted 2 lines · Coly Li

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

Quoted 12 lines
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(-)
arch/xtensa/kernel/time.c +0 -0
index 8848120..9638641 100644

arch/xtensa/kernel/time.c unsigned long ccount_per_jiffy; /* per 1/HZ */ · line 36

Quoted 8 lines
arch/xtensa/kernel/time.c +1 -1
@@ -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.

author
#2 lore raw

Johannes Weiner Wrote:

Quoted 6 lines · Coly Li
Quoted 2 lines

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 :(

Quoted 15 lines
Quoted 15 lines
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(-)
arch/xtensa/kernel/time.c +0 -0
index 8848120..9638641 100644
@@ -30,7 +30,7 @@ unsigned long ccount_per_jiffy;		/* per 1/HZ */
 unsigned long nsec_per_ccount;		/* nsec per ccount increment */
 #endif
Quoted 7 lines

arch/xtensa/kernel/time.c unsigned long ccount_per_jiffy; /* per 1/HZ */ · line 36

Quoted 5 lines
arch/xtensa/kernel/time.c +1 -1
-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.

Signature · 2 lines
Coly Li
SuSE Labs