diff mbox

ARM : omap : remove __init for _enable_preprogram

Message ID 1368547621-8570-1-git-send-email-jp.francois@cynove.com (mailing list archive)
State New, archived
Headers show

Commit Message

Jean-Philippe François May 14, 2013, 4:07 p.m. UTC
_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.

Signed-off-by: Jean-Philippe François <jp.francois@cynove.com>

--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Comments

Kevin Hilman May 14, 2013, 6:08 p.m. UTC | #1
jp.francois@cynove.com writes:

> _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.
>
> Signed-off-by: Jean-Philippe François <jp.francois@cynove.com>

Acked-by: Kevin Hilman <khilman@linaro.org>

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

Kevin

> Index: b/arch/arm/mach-omap2/omap_hwmod.c
> ===================================================================
> --- a/arch/arm/mach-omap2/omap_hwmod.c
> +++ 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;
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Greg Kroah-Hartman May 14, 2013, 6:26 p.m. UTC | #2
On Tue, May 14, 2013 at 06:07:01PM +0200, jp.francois@cynove.com 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.
> 
> Signed-off-by: Jean-Philippe François <jp.francois@cynove.com>

<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 majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Tony Lindgren May 16, 2013, 6:15 p.m. UTC | #3
* Kevin Hilman <khilman@linaro.org> [130514 11:13]:
> jp.francois@cynove.com writes:
> 
> > _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.
> >
> > Signed-off-by: Jean-Philippe François <jp.francois@cynove.com>
> 
> Acked-by: Kevin Hilman <khilman@linaro.org>
> 
> 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
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

Index: b/arch/arm/mach-omap2/omap_hwmod.c
===================================================================
--- a/arch/arm/mach-omap2/omap_hwmod.c
+++ 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;