Skip to content

Commit 6c09ffd

Browse files
arndbMarc Zyngier
authored andcommitted
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: Arnd Bergmann <[email protected]> Signed-off-by: Marc Zyngier <[email protected]>
1 parent 3fad4cd commit 6c09ffd

File tree

1 file changed

+9
-3
lines changed

1 file changed

+9
-3
lines changed

drivers/irqchip/irq-gic-v4.c

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,9 @@ int its_map_vlpi(int irq, struct its_vlpi_map *map)
173173
{
174174
struct its_cmd_info info = {
175175
.cmd_type = MAP_VLPI,
176-
.map = map,
176+
{
177+
.map = map,
178+
},
177179
};
178180

179181
/*
@@ -189,7 +191,9 @@ int its_get_vlpi(int irq, struct its_vlpi_map *map)
189191
{
190192
struct its_cmd_info info = {
191193
.cmd_type = GET_VLPI,
192-
.map = map,
194+
{
195+
.map = map,
196+
},
193197
};
194198

195199
return irq_set_vcpu_affinity(irq, &info);
@@ -205,7 +209,9 @@ int its_prop_update_vlpi(int irq, u8 config, bool inv)
205209
{
206210
struct its_cmd_info info = {
207211
.cmd_type = inv ? PROP_UPDATE_AND_INV_VLPI : PROP_UPDATE_VLPI,
208-
.config = config,
212+
{
213+
.config = config,
214+
},
209215
};
210216

211217
return irq_set_vcpu_affinity(irq, &info);

0 commit comments

Comments
 (0)