Re: [PATCH v1 1/4] [loongson] Remove the inline annotation of prom_init_uart_base()

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Hi, Ralf

This one is also urgent, could you please fold it into "MIPS: Loongson:
Cleanup the serial port support"? thanks!

Best Regards,
	Wu Zhangjin

On Sat, 2009-11-21 at 19:05 +0800, Wu Zhangjin wrote:
> gcc 3.4.6 complains about un-implemented prom_init_uart_base() if using
> inline to annotate prom_init_uart_base(), so, remove the inline here.
> 
> Signed-off-by: Wu Zhangjin <wuzhangjin@xxxxxxxxx>
> ---
>  arch/mips/include/asm/mach-loongson/loongson.h |    2 +-
>  arch/mips/loongson/common/uart_base.c          |    2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/arch/mips/include/asm/mach-loongson/loongson.h b/arch/mips/include/asm/mach-loongson/loongson.h
> index daf7041..a7fa66e 100644
> --- a/arch/mips/include/asm/mach-loongson/loongson.h
> +++ b/arch/mips/include/asm/mach-loongson/loongson.h
> @@ -33,7 +33,7 @@ extern void __init prom_init_machtype(void);
>  extern void __init prom_init_env(void);
>  extern unsigned long _loongson_uart_base;
>  extern unsigned long uart8250_base[];
> -extern inline void __maybe_unused prom_init_uart_base(void);
> +extern void prom_init_uart_base(void);
>  
>  /* irq operation functions */
>  extern void bonito_irqdispatch(void);
> diff --git a/arch/mips/loongson/common/uart_base.c b/arch/mips/loongson/common/uart_base.c
> index 275bed6..1d636f4 100644
> --- a/arch/mips/loongson/common/uart_base.c
> +++ b/arch/mips/loongson/common/uart_base.c
> @@ -29,7 +29,7 @@ unsigned long __maybe_unused uart8250_base[] = {
>  };
>  EXPORT_SYMBOL(uart8250_base);
>  
> -inline void __maybe_unused prom_init_uart_base(void)
> +void __maybe_unused prom_init_uart_base(void)
>  {
>  	_loongson_uart_base =
>  		(unsigned long)ioremap_nocache(uart8250_base[mips_machtype], 8);




[Index of Archives]     [Linux MIPS Home]     [LKML Archive]     [Linux ARM Kernel]     [Linux ARM]     [Linux]     [Git]     [Yosemite News]     [Linux SCSI]     [Linux Hams]

  Powered by Linux