Skip to contentSkip to conversation

ARM: OMAP: clk_disable_unused: init section mismatch

PATCH RESEND In review Kevin Hilman 2 participants 2 messages Nov 2, 2007 – Nov 15, 2007

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

PATCH RESEND 1/1 ARM: OMAP: clk_disable_unused: init section mismatch

Fix the following warning when OMAP_RESET_CLOCKS is enabled:

WARNING: vmlinux.o(.data+0x33a0): Section mismatch: reference to .init.text:omap2_clk_disable_unused (between 'omap2_clk_functions' and 'osc_ck')

omap2_clk_disable_unused cannot be declared __init as it part of a struct where the rest of the functions are not __init.

---
 arch/arm/mach-omap2/clock.c |    2 +-
 arch/arm/mach-omap2/clock.h |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
arch/arm/mach-omap2/clock.c +1 -1
Index: dev/arch/arm/mach-omap2/clock.c
===================================================================
@@ -739,7 +739,7 @@ int omap2_clk_set_parent(struct clk *clk
  *-------------------------------------------------------------------------*/
 
 #ifdef CONFIG_OMAP_RESET_CLOCKS
-void __init omap2_clk_disable_unused(struct clk *clk)
+void omap2_clk_disable_unused(struct clk *clk)
 {
 	u32 regval32, v;
 
arch/arm/mach-omap2/clock.h +1 -1
Index: dev/arch/arm/mach-omap2/clock.h
===================================================================
@@ -30,7 +30,7 @@ int omap2_clk_set_rate(struct clk *clk, 
 int omap2_clk_set_parent(struct clk *clk, struct clk *new_parent);
 
 #ifdef CONFIG_OMAP_RESET_CLOCKS
-void __init omap2_clk_disable_unused(struct clk *clk);
+void omap2_clk_disable_unused(struct clk *clk);
 #else
 #define omap2_clk_disable_unused	NULL
 #endif

--

maintainer
#1 lore raw
Quoted 32 lines · Kevin Hilman

Fix the following warning when OMAP_RESET_CLOCKS is enabled:

WARNING: vmlinux.o(.data+0x33a0): Section mismatch: reference to .init.text:omap2_clk_disable_unused (between 'omap2_clk_functions' and 'osc_ck')

omap2_clk_disable_unused cannot be declared __init as it part of a struct where the rest of the functions are not __init.

---
 arch/arm/mach-omap2/clock.c |    2 +-
 arch/arm/mach-omap2/clock.h |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

Index: dev/arch/arm/mach-omap2/clock.c
===================================================================

arch/arm/mach-omap2/clock.c +1 -1
@@ -739,7 +739,7 @@ int omap2_clk_set_parent(struct clk *clk
  *-------------------------------------------------------------------------*/
 
 #ifdef CONFIG_OMAP_RESET_CLOCKS
-void __init omap2_clk_disable_unused(struct clk *clk)
+void omap2_clk_disable_unused(struct clk *clk)
 {
 	u32 regval32, v;
 

Index: dev/arch/arm/mach-omap2/clock.h
===================================================================

arch/arm/mach-omap2/clock.h int omap2_clk_set_rate(struct clk *clk, · line 36

Quoted 8 lines
arch/arm/mach-omap2/clock.h +1 -1
@@ -30,7 +30,7 @@ int omap2_clk_set_rate(struct clk *clk, 
 int omap2_clk_set_parent(struct clk *clk, struct clk *new_parent);
 
 #ifdef CONFIG_OMAP_RESET_CLOCKS
-void __init omap2_clk_disable_unused(struct clk *clk);
+void omap2_clk_disable_unused(struct clk *clk);
 #else
 #define omap2_clk_disable_unused	NULL
 #endif

Oops, pushing this updated version instead :)

Tony