projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'upstream-fixes'
[firefly-linux-kernel-4.4.55.git]
/
kernel
/
rcutorture.c
diff --git
a/kernel/rcutorture.c
b/kernel/rcutorture.c
index 773219907dd8a96698f6c0390778538071e2e890..7712912dbc8488d54c7be1c73947a285005ba8a7 100644
(file)
--- a/
kernel/rcutorture.c
+++ b/
kernel/rcutorture.c
@@
-114,16
+114,16
@@
rcu_torture_alloc(void)
{
struct list_head *p;
{
struct list_head *p;
- spin_lock(&rcu_torture_lock);
+ spin_lock
_bh
(&rcu_torture_lock);
if (list_empty(&rcu_torture_freelist)) {
atomic_inc(&n_rcu_torture_alloc_fail);
if (list_empty(&rcu_torture_freelist)) {
atomic_inc(&n_rcu_torture_alloc_fail);
- spin_unlock(&rcu_torture_lock);
+ spin_unlock
_bh
(&rcu_torture_lock);
return NULL;
}
atomic_inc(&n_rcu_torture_alloc);
p = rcu_torture_freelist.next;
list_del_init(p);
return NULL;
}
atomic_inc(&n_rcu_torture_alloc);
p = rcu_torture_freelist.next;
list_del_init(p);
- spin_unlock(&rcu_torture_lock);
+ spin_unlock
_bh
(&rcu_torture_lock);
return container_of(p, struct rcu_torture, rtort_free);
}
return container_of(p, struct rcu_torture, rtort_free);
}
@@
-134,9
+134,9
@@
static void
rcu_torture_free(struct rcu_torture *p)
{
atomic_inc(&n_rcu_torture_free);
rcu_torture_free(struct rcu_torture *p)
{
atomic_inc(&n_rcu_torture_free);
- spin_lock(&rcu_torture_lock);
+ spin_lock
_bh
(&rcu_torture_lock);
list_add_tail(&p->rtort_free, &rcu_torture_freelist);
list_add_tail(&p->rtort_free, &rcu_torture_freelist);
- spin_unlock(&rcu_torture_lock);
+ spin_unlock
_bh
(&rcu_torture_lock);
}
static void
}
static void