diff --git a/[refs] b/[refs] index 28d5ae83c59e..6ceafc26cf5a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 344ac148442e3223ac1b0e29ef3d3fb73c5ed61a +refs/heads/master: 6318af900ca7cb2c94b27d3c358762e6ac187e25 diff --git a/trunk/drivers/sh/intc/virq.c b/trunk/drivers/sh/intc/virq.c index e5bf5d3c698e..4e0ff7181164 100644 --- a/trunk/drivers/sh/intc/virq.c +++ b/trunk/drivers/sh/intc/virq.c @@ -215,7 +215,7 @@ static void __init intc_subgroup_map(struct intc_desc_int *d) entry = radix_tree_deref_slot((void **)entries[i]); if (unlikely(!entry)) continue; - if (unlikely(entry == RADIX_TREE_RETRY)) + if (radix_tree_deref_retry(entry)) goto restart; irq = create_irq();