From: Paul Mundt Date: Mon, 15 Nov 2010 05:30:30 +0000 (+0900) Subject: sh: intc: Fix up build failure introduced by radix tree changes. X-Git-Tag: v2.6.37-rc2~11^2 X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=6318af900ca7cb2c94b27d3c358762e6ac187e25;p=~shefty%2Frdma-dev.git sh: intc: Fix up build failure introduced by radix tree changes. The radix tree retry logic got a bit of an overhaul and subsequently broke the virtual IRQ subgroup build. Simply switch over to radix_tree_deref_retry() as per the filemap changes, which the virq lookup logic was modelled after in the first place. Signed-off-by: Paul Mundt --- diff --git a/drivers/sh/intc/virq.c b/drivers/sh/intc/virq.c index e5bf5d3c698..4e0ff718116 100644 --- a/drivers/sh/intc/virq.c +++ b/drivers/sh/intc/virq.c @@ -215,7 +215,7 @@ restart: 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();