Skip to contentSkip to conversation

ARM: mv78xx0: correct addr_map_cfg __initdata annotation

PATCH In review Arnd Bergmann 2 participants 2 messages Oct 3, 2012

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

PATCH 1/1 ARM: mv78xx0: correct addr_map_cfg __initdata annotation

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]

Cc Jason Cooper <[email protected]>
Cc Andrew Lunn <[email protected]>

---
Queued in the late/fixes branch

arch/arm/mach-mv78xx0/addr-map.c +1 -1
index a9bc841..03f7486 100644
@@ -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,
maintainer Acked-by on v1 1/1
#1 lore raw
Quoted 18 lines · Arnd Bergmann

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]

Cc Jason Cooper <[email protected]>
Cc Andrew Lunn <[email protected]>

---
Queued in the late/fixes branch

arch/arm/mach-mv78xx0/addr-map.c +0 -0
index a9bc841..03f7486 100644

arch/arm/mach-mv78xx0/addr-map.c static void __init __iomem *win_cfg_base(const struct orion_addr_map_cfg *cfg, i · line 59

Quoted 8 lines
arch/arm/mach-mv78xx0/addr-map.c +1 -1
@@ -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. :-(