[PATCH] ARM : omap : remove __init for _enable_preprogram

Kevin Hilman khilman at linaro.org
Tue May 14 14:08:20 EDT 2013


jp.francois at 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 at cynove.com>

Acked-by: Kevin Hilman <khilman at 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;



More information about the linux-arm-kernel mailing list