Skip to contentSkip to conversation

ARM : omap : remove __init for _enable_preprogram

PATCH New jp.francois at cynove.com 4 participants 4 messages May 14, 2013 – May 16, 2013

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

PATCH 1/1 ARM : omap : remove __init for _enable_preprogram

_enable_preprogram is marked as __init, but is called from _enable which is not. This results in oops once init is freed.
Fix this by removing the __init marker.

arch/arm/mach-omap2/omap_hwmod.c +1 -1
Index: b/arch/arm/mach-omap2/omap_hwmod.c
===================================================================
@@ -2066,7 +2066,7 @@
  * do so is present in the hwmod data, then call it and pass along the
  * return value; otherwise, return 0.
  */
-static int __init _enable_preprogram(struct omap_hwmod *oh)
+static int _enable_preprogram(struct omap_hwmod *oh)
 {
 	if (!oh->class->enable_preprogram)
 		return 0;
#1 lore raw

PATCH 1/1 ARM : omap : remove __init for _enable_preprogram

Quoted 5 lines · jp.francois at cynove.com

_enable_preprogram is marked as __init, but is called from _enable which is not. This results in oops once init is freed.
Fix this by removing the __init marker.

Tony, this should probably be queued for v3.10-rc, and tagged for stable.

Kevin

Quoted 13 lines

Index: b/arch/arm/mach-omap2/omap_hwmod.c
===================================================================

arch/arm/mach-omap2/omap_hwmod.c +1 -1
@@ -2066,7 +2066,7 @@
  * do so is present in the hwmod data, then call it and pass along the
  * return value; otherwise, return 0.
  */
-static int __init _enable_preprogram(struct omap_hwmod *oh)
+static int _enable_preprogram(struct omap_hwmod *oh)
 {
 	if (!oh->class->enable_preprogram)
 		return 0;
maintainer
#2 lore raw

PATCH 1/1 ARM : omap : remove __init for _enable_preprogram

Quoted 11 lines · Kevin Hilman
Quoted 5 lines · jp.francois at cynove.com

_enable_preprogram is marked as __init, but is called from _enable which is not. This results in oops once init is freed.
Fix this by removing the __init marker.

Tony, this should probably be queued for v3.10-rc, and tagged for stable.

Yes just applied the earlier version of this and added your ack with cc: stable.

Regards,

Tony

#3 lore raw

PATCH 1/1 ARM : omap : remove __init for _enable_preprogram

In reply to jp.francois at cynove.com
Quoted 5 lines · On Tue, May 14, 2013 at 06:07:01PM +0200, [email protected] wrote:

_enable_preprogram is marked as __init, but is called from _enable which is not. This results in oops once init is freed.
Fix this by removing the __init marker.

<formletter>

This is not the correct way to submit patches for inclusion in the stable kernel tree. Please read Documentation/stable_kernel_rules.txt for how to do this properly.

</formletter>
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html