| Message ID | 20190307103557.1688556-1-arnd@arndb.de (mailing list archive) |
|---|---|
| State | Mainlined, archived |
| Commit | 27e23d8975270df6999f8b5b3156fc0c04927451 |
| Headers | show |
| Series | ARM: omap2: remove incorrect __init annotation | expand |
On Thu, Mar 07, 2019 at 11:35:50AM +0100, Arnd Bergmann wrote: > omap3xxx_prm_enable_io_wakeup() is marked __init, but its caller is not, so > we get a warning with clang-8: > > WARNING: vmlinux.o(.text+0x343c8): Section mismatch in reference from the function omap3xxx_prm_late_init() to the function .init.text:omap3xxx_prm_enable_io_wakeup() > The function omap3xxx_prm_late_init() references > the function __init omap3xxx_prm_enable_io_wakeup(). > This is often because omap3xxx_prm_late_init lacks a __init > annotation or the annotation of omap3xxx_prm_enable_io_wakeup is wrong. > > When building with gcc, omap3xxx_prm_enable_io_wakeup() is always > inlined, so we never noticed in the past. > > Signed-off-by: Arnd Bergmann <arnd@arndb.de> Reviewed-by: Nathan Chancellor <natechancellor@gmail.com> > --- > arch/arm/mach-omap2/prm3xxx.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/arch/arm/mach-omap2/prm3xxx.c b/arch/arm/mach-omap2/prm3xxx.c > index 05858f966f7d..dfa65fc2c82b 100644 > --- a/arch/arm/mach-omap2/prm3xxx.c > +++ b/arch/arm/mach-omap2/prm3xxx.c > @@ -433,7 +433,7 @@ static void omap3_prm_reconfigure_io_chain(void) > * registers, and omap3xxx_prm_reconfigure_io_chain() must be called. > * No return value. > */ > -static void __init omap3xxx_prm_enable_io_wakeup(void) > +static void omap3xxx_prm_enable_io_wakeup(void) > { > if (prm_features & PRM_HAS_IO_WAKEUP) > omap2_prm_set_mod_reg_bits(OMAP3430_EN_IO_MASK, WKUP_MOD, > -- > 2.20.0 >
* Nathan Chancellor <natechancellor@gmail.com> [190307 15:36]: > On Thu, Mar 07, 2019 at 11:35:50AM +0100, Arnd Bergmann wrote: > > omap3xxx_prm_enable_io_wakeup() is marked __init, but its caller is not, so > > we get a warning with clang-8: > > > > WARNING: vmlinux.o(.text+0x343c8): Section mismatch in reference from the function omap3xxx_prm_late_init() to the function .init.text:omap3xxx_prm_enable_io_wakeup() > > The function omap3xxx_prm_late_init() references > > the function __init omap3xxx_prm_enable_io_wakeup(). > > This is often because omap3xxx_prm_late_init lacks a __init > > annotation or the annotation of omap3xxx_prm_enable_io_wakeup is wrong. > > > > When building with gcc, omap3xxx_prm_enable_io_wakeup() is always > > inlined, so we never noticed in the past. > > > > Signed-off-by: Arnd Bergmann <arnd@arndb.de> > > Reviewed-by: Nathan Chancellor <natechancellor@gmail.com> Arnd please just apply this directly, this should not cause merge conflicts: Acked-by: Tony Lindgren <tony@atomide.com>
diff --git a/arch/arm/mach-omap2/prm3xxx.c b/arch/arm/mach-omap2/prm3xxx.c index 05858f966f7d..dfa65fc2c82b 100644 --- a/arch/arm/mach-omap2/prm3xxx.c +++ b/arch/arm/mach-omap2/prm3xxx.c @@ -433,7 +433,7 @@ static void omap3_prm_reconfigure_io_chain(void) * registers, and omap3xxx_prm_reconfigure_io_chain() must be called. * No return value. */ -static void __init omap3xxx_prm_enable_io_wakeup(void) +static void omap3xxx_prm_enable_io_wakeup(void) { if (prm_features & PRM_HAS_IO_WAKEUP) omap2_prm_set_mod_reg_bits(OMAP3430_EN_IO_MASK, WKUP_MOD,
omap3xxx_prm_enable_io_wakeup() is marked __init, but its caller is not, so we get a warning with clang-8: WARNING: vmlinux.o(.text+0x343c8): Section mismatch in reference from the function omap3xxx_prm_late_init() to the function .init.text:omap3xxx_prm_enable_io_wakeup() The function omap3xxx_prm_late_init() references the function __init omap3xxx_prm_enable_io_wakeup(). This is often because omap3xxx_prm_late_init lacks a __init annotation or the annotation of omap3xxx_prm_enable_io_wakeup is wrong. When building with gcc, omap3xxx_prm_enable_io_wakeup() is always inlined, so we never noticed in the past. Signed-off-by: Arnd Bergmann <arnd@arndb.de> --- arch/arm/mach-omap2/prm3xxx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)