diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2018-10-16 22:13:51 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2018-10-16 22:13:50 -0700 |
| commit | a66d8962f27e1f5c2fd1f765a2ae9afa1e8eb6b4 (patch) | |
| tree | 3028e94f99824180626f9fbfb6e5a66f551641e1 /lib | |
| parent | 14ca49a1a44c4c07b8040fcfdb9671d21d5df06d (diff) | |
| parent | f25fed271059c7a4afe6db46f085e80e2c4db073 (diff) | |
Merge "Merge android-4.4.160 (a94efb1) into msm-4.4"
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/klist.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/lib/klist.c b/lib/klist.c index 0507fa5d84c5..f6b547812fe3 100644 --- a/lib/klist.c +++ b/lib/klist.c @@ -336,8 +336,9 @@ struct klist_node *klist_prev(struct klist_iter *i) void (*put)(struct klist_node *) = i->i_klist->put; struct klist_node *last = i->i_cur; struct klist_node *prev; + unsigned long flags; - spin_lock(&i->i_klist->k_lock); + spin_lock_irqsave(&i->i_klist->k_lock, flags); if (last) { prev = to_klist_node(last->n_node.prev); @@ -356,7 +357,7 @@ struct klist_node *klist_prev(struct klist_iter *i) prev = to_klist_node(prev->n_node.prev); } - spin_unlock(&i->i_klist->k_lock); + spin_unlock_irqrestore(&i->i_klist->k_lock, flags); if (put && last) put(last); @@ -377,8 +378,9 @@ struct klist_node *klist_next(struct klist_iter *i) void (*put)(struct klist_node *) = i->i_klist->put; struct klist_node *last = i->i_cur; struct klist_node *next; + unsigned long flags; - spin_lock(&i->i_klist->k_lock); + spin_lock_irqsave(&i->i_klist->k_lock, flags); if (last) { next = to_klist_node(last->n_node.next); @@ -397,7 +399,7 @@ struct klist_node *klist_next(struct klist_iter *i) next = to_klist_node(next->n_node.next); } - spin_unlock(&i->i_klist->k_lock); + spin_unlock_irqrestore(&i->i_klist->k_lock, flags); if (put && last) put(last); |