diff options
| author |  Paul E. McKenney <paulmck@linux.ibm.com>
| 2019-06-24 09:12:39 -0700 |
|---|---|---|
| committer | Paul E. McKenney <paulmck@linux.ibm.com>
| 2019-06-24 09:12:39 -0700 |
| commit | b989ff070574ad8b8621d866de0a8e9a65d42c80 (patch) | |
| tree | f93489ff6715891e4d13bc3e09521000894d18e6 /kernel/locking | |
| parent | tools/memory-model: Improve data-race detection (diff) | |
| parent | Merge branches 'consolidate.2019.05.28a', 'doc.2019.05.28a', 'fixes.2019.06.1... (diff) | |
| download | linux-b989ff070574ad8b8621d866de0a8e9a65d42c80.tar.gz linux-b989ff070574ad8b8621d866de0a8e9a65d42c80.tar.bz2 linux-b989ff070574ad8b8621d866de0a8e9a65d42c80.zip | |
Merge LKMM and RCU commits
Diffstat (limited to 'kernel/locking')
| -rw-r--r-- | kernel/locking/locktorture.c | 2 | ||||
| -rw-r--r-- | kernel/locking/percpu-rwsem.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/kernel/locking/locktorture.c b/kernel/locking/locktorture.c index 80a463d31a8d..c513031cd7e3 100644 --- a/kernel/locking/locktorture.c +++ b/kernel/locking/locktorture.c @@ -975,7 +975,7 @@ static int __init lock_torture_init(void) goto unwind; } if (stutter > 0) { - firsterr = torture_stutter_init(stutter); + firsterr = torture_stutter_init(stutter, stutter); if (firsterr) goto unwind; } diff --git a/kernel/locking/percpu-rwsem.c b/kernel/locking/percpu-rwsem.c index f17dad99eec8..48cab93a47fd 100644 --- a/kernel/locking/percpu-rwsem.c +++ b/kernel/locking/percpu-rwsem.c @@ -17,7 +17,7 @@ int __percpu_init_rwsem(struct percpu_rw_semaphore *sem, return -ENOMEM; /* ->rw_sem represents the whole percpu_rw_semaphore for lockdep */ - rcu_sync_init(&sem->rss, RCU_SCHED_SYNC); + rcu_sync_init(&sem->rss); __init_rwsem(&sem->rw_sem, name, rwsem_key); rcuwait_init(&sem->writer); sem->readers_block = 0; |