Commit 6c09ffd0 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Marc Zyngier

irqchip/gic-v4: Fix building with ancient gcc

gcc-4.5 and earlier don't like named initializers for anonymous
union members:

drivers/irqchip/irq-gic-v4.c: In function 'its_map_vlpi':
drivers/irqchip/irq-gic-v4.c:176:3: error: unknown field 'map' specified in initializer
drivers/irqchip/irq-gic-v4.c:176:3: error: missing braces around initializer
drivers/irqchip/irq-gic-v4.c:176:3: error: (near initialization for 'info.<anonymous>')
drivers/irqchip/irq-gic-v4.c: In function 'its_get_vlpi':
drivers/irqchip/irq-gic-v4.c:192:3: error: unknown field 'map' specified in initializer
drivers/irqchip/irq-gic-v4.c:192:3: error: missing braces around initializer
drivers/irqchip/irq-gic-v4.c:192:3: error: (near initialization for 'info.<anonymous>')
drivers/irqchip/irq-gic-v4.c: In function 'its_prop_update_vlpi':
drivers/irqchip/irq-gic-v4.c:208:3: error: unknown field 'config' specified in initializer
drivers/irqchip/irq-gic-v4.c:208:3: error: missing braces around initializer
drivers/irqchip/irq-gic-v4.c:208:3: error: (near initialization for 'info.<anonymous>')
drivers/irqchip/irq-gic-v4.c:208:3: error: initialization makes pointer from integer without a cast

This is fairly easy to work around, by using extra curly braces.
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarMarc Zyngier <marc.zyngier@arm.com>
parent 3fad4cda
...@@ -173,7 +173,9 @@ int its_map_vlpi(int irq, struct its_vlpi_map *map) ...@@ -173,7 +173,9 @@ int its_map_vlpi(int irq, struct its_vlpi_map *map)
{ {
struct its_cmd_info info = { struct its_cmd_info info = {
.cmd_type = MAP_VLPI, .cmd_type = MAP_VLPI,
{
.map = map, .map = map,
},
}; };
/* /*
...@@ -189,7 +191,9 @@ int its_get_vlpi(int irq, struct its_vlpi_map *map) ...@@ -189,7 +191,9 @@ int its_get_vlpi(int irq, struct its_vlpi_map *map)
{ {
struct its_cmd_info info = { struct its_cmd_info info = {
.cmd_type = GET_VLPI, .cmd_type = GET_VLPI,
{
.map = map, .map = map,
},
}; };
return irq_set_vcpu_affinity(irq, &info); return irq_set_vcpu_affinity(irq, &info);
...@@ -205,7 +209,9 @@ int its_prop_update_vlpi(int irq, u8 config, bool inv) ...@@ -205,7 +209,9 @@ int its_prop_update_vlpi(int irq, u8 config, bool inv)
{ {
struct its_cmd_info info = { struct its_cmd_info info = {
.cmd_type = inv ? PROP_UPDATE_AND_INV_VLPI : PROP_UPDATE_VLPI, .cmd_type = inv ? PROP_UPDATE_AND_INV_VLPI : PROP_UPDATE_VLPI,
{
.config = config, .config = config,
},
}; };
return irq_set_vcpu_affinity(irq, &info); return irq_set_vcpu_affinity(irq, &info);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment