|
@@ -645,7 +645,7 @@ static int __init gic_of_init(struct device_node *node,
|
|
|
|
|
|
/* Find the first available CPU vector. */
|
|
|
i = 0;
|
|
|
- reserved = (C_SW0 | C_SW1) >> __fls(C_SW0);
|
|
|
+ reserved = (C_SW0 | C_SW1) >> __ffs(C_SW0);
|
|
|
while (!of_property_read_u32_index(node, "mti,reserved-cpu-vectors",
|
|
|
i++, &cpu_vec))
|
|
|
reserved |= BIT(cpu_vec);
|
|
@@ -684,11 +684,11 @@ static int __init gic_of_init(struct device_node *node,
|
|
|
|
|
|
gicconfig = read_gic_config();
|
|
|
gic_shared_intrs = gicconfig & GIC_CONFIG_NUMINTERRUPTS;
|
|
|
- gic_shared_intrs >>= __fls(GIC_CONFIG_NUMINTERRUPTS);
|
|
|
+ gic_shared_intrs >>= __ffs(GIC_CONFIG_NUMINTERRUPTS);
|
|
|
gic_shared_intrs = (gic_shared_intrs + 1) * 8;
|
|
|
|
|
|
gic_vpes = gicconfig & GIC_CONFIG_PVPS;
|
|
|
- gic_vpes >>= __fls(GIC_CONFIG_PVPS);
|
|
|
+ gic_vpes >>= __ffs(GIC_CONFIG_PVPS);
|
|
|
gic_vpes = gic_vpes + 1;
|
|
|
|
|
|
if (cpu_has_veic) {
|