[PATCH] ARM: mv78xx0: correct addr_map_cfg __initdata annotation

Andrew Lunn andrew at lunn.ch
Wed Oct 3 15:23:23 EDT 2012


On Wed, Oct 03, 2012 at 07:06:34PM +0000, Arnd Bergmann wrote:
> The annotation on the addr_map_cfg variable is in the wrong place.
> 
> Without this patch, building mv78xx0_defconfig results in:
> 
> /home/arnd/linux-arm/arch/arm/mach-mv78xx0/addr-map.c:59:2: warning: initialization from incompatible pointer type [enabled by default]
> /home/arnd/linux-arm/arch/arm/mach-mv78xx0/addr-map.c:59:2: warning: (near initialization for 'addr_map_cfg.win_cfg_base') [enabled by default]
> 
> Signed-off-by: Arnd Bergmann <arnd at arndb.de>
> Cc: Jason Cooper <jason at lakedaemon.net>
> Cc: Andrew Lunn <andrew at lunn.ch>
> ---
> Queued in the late/fixes branch
> 
> diff --git a/arch/arm/mach-mv78xx0/addr-map.c b/arch/arm/mach-mv78xx0/addr-map.c
> index a9bc841..03f7486 100644
> --- a/arch/arm/mach-mv78xx0/addr-map.c
> +++ b/arch/arm/mach-mv78xx0/addr-map.c
> @@ -53,7 +53,7 @@ static void __init __iomem *win_cfg_base(const struct orion_addr_map_cfg *cfg, i
>  /*
>   * Description of the windows needed by the platform code
>   */
> -static struct __initdata orion_addr_map_cfg addr_map_cfg = {
> +static struct orion_addr_map_cfg addr_map_cfg __initdata = {
>  	.num_wins = 14,
>  	.remappable_wins = 8,
>  	.win_cfg_base = win_cfg_base,

Humm, been there, done that once. Must of forgotten to post it. :-(

Acked-by: Andrew Lunn <andrew at lunn.ch>



More information about the linux-arm-kernel mailing list