[PATCH] Fix build error if CONFIG_CEVT_R4K was not defined

[PATCH] Fix build error if CONFIG_CEVT_R4K was not defined

[Atsushi Nemoto]

This patch fixes build error introduced by "MIPS: SMTC:
Fix xxx_clockevent_init() naming conflict for SMT".

Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
---
 arch/mips/include/asm/time.h |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/arch/mips/include/asm/time.h b/arch/mips/include/asm/time.h
index e46f23f..df6a430 100644
--- a/arch/mips/include/asm/time.h
+++ b/arch/mips/include/asm/time.h
@@ -61,7 +61,7 @@ static inline int mips_clockevent_init(void)
 	extern int smtc_clockevent_init(void);
 
 	return smtc_clockevent_init();
-#elif CONFIG_CEVT_R4K
+#elif defined(CONFIG_CEVT_R4K)
 	return r4k_clockevent_init();
 #else
 	return -ENXIO;
-- 
1.5.6.3

Re: [PATCH] Fix build error if CONFIG_CEVT_R4K was not defined

[Kevin D. Kissell]

Drat, and I was *sure* that I'd tested that in a non-SMTC
configuration!  Thanks!

          Kevin K.

Atsushi Nemoto wrote:
> This patch fixes build error introduced by "MIPS: SMTC:
> Fix xxx_clockevent_init() naming conflict for SMT".
>
> Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
> ---
>  arch/mips/include/asm/time.h |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/arch/mips/include/asm/time.h b/arch/mips/include/asm/time.h
> index e46f23f..df6a430 100644
> --- a/arch/mips/include/asm/time.h
> +++ b/arch/mips/include/asm/time.h
> @@ -61,7 +61,7 @@ static inline int mips_clockevent_init(void)
>  	extern int smtc_clockevent_init(void);
>  
>  	return smtc_clockevent_init();
> -#elif CONFIG_CEVT_R4K
> +#elif defined(CONFIG_CEVT_R4K)
>  	return r4k_clockevent_init();
>  #else
>  	return -ENXIO;
>   

Re: [PATCH] Fix build error if CONFIG_CEVT_R4K was not defined

[Ralf Baechle]

On Tue, Apr 07, 2009 at 12:04:55AM +0900, Atsushi Nemoto wrote:

> This patch fixes build error introduced by "MIPS: SMTC:
> Fix xxx_clockevent_init() naming conflict for SMT".

I've already commited an identical patch last night.

Luckily modern gcc throws an error for this sort of issue; in the past it
used to be subtle breakage ...

  Ralf

Re: [PATCH] Fix build error if CONFIG_CEVT_R4K was not defined

[Ralf Baechle]

On Mon, Apr 06, 2009 at 05:09:36PM +0200, Kevin D. Kissell wrote:

> Drat, and I was *sure* that I'd tested that in a non-SMTC
> configuration!  Thanks!

I ran into it when upgrading the IP35 port to master.  At least IP27 would
should have been affected by the issue as well.  It's may be possible that
you missed the issue due to an ancient compiler.

  Ralf