Prev: pmcraid : Remove unwanted cast for void * pointers
Next: MIPS: Add BBIT0 and BBIT1 instructions to uasm
From: Nicolas Pitre on 23 Jul 2010 22:40 On Fri, 23 Jul 2010, Uwe Kleine-König wrote: > qnap_tsx1x_register_flash is only called by qnap_ts219_init and > qnap_ts41x_init which both live in .init.text, too. So the move is OK. > > This fixes the following warning in kirkwood_defconfig: > WARNING: vmlinux.o(.text+0x9334): Section mismatch in reference from the function qnap_tsx1x_register_flash() to the variable .init.data:qnap_tsx1x_spi_slave_info > The function qnap_tsx1x_register_flash() references > the variable __initdata qnap_tsx1x_spi_slave_info. > This is often because qnap_tsx1x_register_flash lacks a __initdata > annotation or the annotation of qnap_tsx1x_spi_slave_info is wrong. > > Signed-off-by: Uwe Kleine-König <u.kleine-koenig(a)pengutronix.de> ACK. You may send to RMK's patch system. > --- > arch/arm/mach-kirkwood/tsx1x-common.c | 2 +- > arch/arm/mach-kirkwood/tsx1x-common.h | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/arch/arm/mach-kirkwood/tsx1x-common.c b/arch/arm/mach-kirkwood/tsx1x-common.c > index 7221c20..f781164 100644 > --- a/arch/arm/mach-kirkwood/tsx1x-common.c > +++ b/arch/arm/mach-kirkwood/tsx1x-common.c > @@ -77,7 +77,7 @@ struct spi_board_info __initdata qnap_tsx1x_spi_slave_info[] = { > }, > }; > > -void qnap_tsx1x_register_flash(void) > +void __init qnap_tsx1x_register_flash(void) > { > spi_register_board_info(qnap_tsx1x_spi_slave_info, > ARRAY_SIZE(qnap_tsx1x_spi_slave_info)); > diff --git a/arch/arm/mach-kirkwood/tsx1x-common.h b/arch/arm/mach-kirkwood/tsx1x-common.h > index 9a59296..7fa0373 100644 > --- a/arch/arm/mach-kirkwood/tsx1x-common.h > +++ b/arch/arm/mach-kirkwood/tsx1x-common.h > @@ -1,7 +1,7 @@ > #ifndef __ARCH_KIRKWOOD_TSX1X_COMMON_H > #define __ARCH_KIRKWOOD_TSX1X_COMMON_H > > -extern void qnap_tsx1x_register_flash(void); > +extern void __init qnap_tsx1x_register_flash(void); > extern void qnap_tsx1x_power_off(void); > > #endif > -- > 1.7.1 > |