LinuxLists.cc - [2.6.25 patch] mips: fix SNI

2008-02-17 22:00:28

Subject: [2.6.25 patch] mips: fix SNI_RM EISA=n compilation

This patch fixes the following build error with CONFIG_EISA=n caused by
commit 231a35d37293ab88d325a9cb94e5474c156282c0:

<-- snip -->

...
LD .tmp_vmlinux1
arch/mips/sni/built-in.o: In function `snirm_a20r_setup_devinit':
a20r.c:(.init.text+0x42c): undefined reference to `sni_eisa_root_init'
a20r.c:(.init.text+0x42c): relocation truncated to fit: R_MIPS_26 against `sni_eisa_root_init'
arch/mips/sni/built-in.o: In function `snirm_setup_devinit':
rm200.c:(.init.text+0x52c): undefined reference to `sni_eisa_root_init'
rm200.c:(.init.text+0x52c): relocation truncated to fit: R_MIPS_26 against `sni_eisa_root_init'
make[1]: *** [.tmp_vmlinux1] Error 1

<-- snip -->

Signed-off-by: Adrian Bunk <[email protected]>

---
f6a6c34454cbe463e2d8d567d9e0659161a82a72 diff --git a/include/asm-mips/sni.h b/include/asm-mips/sni.h
index e716447..8c1eb02 100644
--- a/include/asm-mips/sni.h
+++ b/include/asm-mips/sni.h
@@ -228,7 +228,14 @@ extern void sni_pcimt_irq_init(void);
extern void sni_cpu_time_init(void);

/* eisa init for RM200/400 */
+#ifdef CONFIG_EISA
extern int sni_eisa_root_init(void);
+#else
+static inline int sni_eisa_root_init(void)
+{
+ return 0;
+}
+#endif

/* common irq stuff */
extern void (*sni_hwint)(void);

2008-02-18 12:23:21

by Thomas Bogendoerfer

[permalink] [raw]

Subject: Re: [2.6.25 patch] mips: fix SNI_RM EISA=n compilation

On Sun, Feb 17, 2008 at 11:59:48PM +0200, Adrian Bunk wrote:
> This patch fixes the following build error with CONFIG_EISA=n caused by
> commit 231a35d37293ab88d325a9cb94e5474c156282c0:
>
> <-- snip -->
>
> ...
> LD .tmp_vmlinux1
> arch/mips/sni/built-in.o: In function `snirm_a20r_setup_devinit':
> a20r.c:(.init.text+0x42c): undefined reference to `sni_eisa_root_init'
> a20r.c:(.init.text+0x42c): relocation truncated to fit: R_MIPS_26 against `sni_eisa_root_init'
> arch/mips/sni/built-in.o: In function `snirm_setup_devinit':
> rm200.c:(.init.text+0x52c): undefined reference to `sni_eisa_root_init'
> rm200.c:(.init.text+0x52c): relocation truncated to fit: R_MIPS_26 against `sni_eisa_root_init'
> make[1]: *** [.tmp_vmlinux1] Error 1
>
> <-- snip -->
>
> Signed-off-by: Adrian Bunk <[email protected]>

Thanks for your fix, Adrian.

Ralf, please apply.

Acked-by: Thomas Bogendoerfer <[email protected]>

>
> ---
> f6a6c34454cbe463e2d8d567d9e0659161a82a72 diff --git a/include/asm-mips/sni.h b/include/asm-mips/sni.h
> index e716447..8c1eb02 100644
> --- a/include/asm-mips/sni.h
> +++ b/include/asm-mips/sni.h
> @@ -228,7 +228,14 @@ extern void sni_pcimt_irq_init(void);
> extern void sni_cpu_time_init(void);
>
> /* eisa init for RM200/400 */
> +#ifdef CONFIG_EISA
> extern int sni_eisa_root_init(void);
> +#else
> +static inline int sni_eisa_root_init(void)
> +{
> + return 0;
> +}
> +#endif
>
> /* common irq stuff */
> extern void (*sni_hwint)(void);

--
Crap can work. Given enough thrust pigs will fly, but it's not necessary a
good idea. [ RFC1925, 2.3 ]

2008-02-19 16:38:23

by Ralf Baechle

[permalink] [raw]