diff options
| author | Ingo Molnar <mingo@kernel.org> | 2016-02-04 08:57:44 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-02-04 08:57:44 +0100 |
| commit | b83ea91f08f648460b08e8980560abdf96060a19 (patch) | |
| tree | 1a6db205770ed7103afe0aa1234dec0b1227f380 /drivers/hwspinlock/hwspinlock_core.c | |
| parent | 8eb22c984eb9eeaed47130f5679acd367af69678 (diff) | |
| parent | 580df49eed6639263348af3ff60941ff14aa72c0 (diff) | |
Merge branch 'perf/urgent' into perf/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/hwspinlock/hwspinlock_core.c')
| -rw-r--r-- | drivers/hwspinlock/hwspinlock_core.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/hwspinlock/hwspinlock_core.c b/drivers/hwspinlock/hwspinlock_core.c index 52f708bcf77f..d50c701b19d6 100644 --- a/drivers/hwspinlock/hwspinlock_core.c +++ b/drivers/hwspinlock/hwspinlock_core.c @@ -313,6 +313,10 @@ int of_hwspin_lock_get_id(struct device_node *np, int index) hwlock = radix_tree_deref_slot(slot); if (unlikely(!hwlock)) continue; + if (radix_tree_is_indirect_ptr(hwlock)) { + slot = radix_tree_iter_retry(&iter); + continue; + } if (hwlock->bank->dev->of_node == args.np) { ret = 0; |