diff options
| author |   Paul Mundt <lethal@linux-sh.org> | 2010-11-15 14:30:30 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2010-11-15 14:30:30 +0900 |
| commit | 6318af900ca7cb2c94b27d3c358762e6ac187e25 (patch) | |
| tree | 3b07dcc8f33ffbe58f9ae63a6e6c0510edca735b | |
| parent | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into sh/urgent (diff) | |
| download | linux-dev-6318af900ca7cb2c94b27d3c358762e6ac187e25.tar.xz linux-dev-6318af900ca7cb2c94b27d3c358762e6ac187e25.zip | |
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 <lethal@linux-sh.org>
| -rw-r--r-- | drivers/sh/intc/virq.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/sh/intc/virq.c b/drivers/sh/intc/virq.c index e5bf5d3c698e..4e0ff7181164 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(); |