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/cgroup | |
| parent | 4289ee7d5a8343eaddd0986f8fb492868e2f546f (diff) | |
| parent | 11ca7a9d541d09586fbf89290d1e14619cc40de0 (diff) | |
| download | linux-b989ff070574ad8b8621d866de0a8e9a65d42c80.tar.bz2 | |
Merge LKMM and RCU commits
Diffstat (limited to 'kernel/cgroup')
| -rw-r--r-- | kernel/cgroup/cgroup.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/kernel/cgroup/cgroup.c b/kernel/cgroup/cgroup.c index 217cec4e22c6..b112e93388dc 100644 --- a/kernel/cgroup/cgroup.c +++ b/kernel/cgroup/cgroup.c @@ -101,7 +101,7 @@ static DEFINE_SPINLOCK(cgroup_idr_lock); */ static DEFINE_SPINLOCK(cgroup_file_kn_lock); -struct percpu_rw_semaphore cgroup_threadgroup_rwsem; +DEFINE_PERCPU_RWSEM(cgroup_threadgroup_rwsem); #define cgroup_assert_mutex_or_rcu_locked() \ RCU_LOCKDEP_WARN(!rcu_read_lock_held() && \ @@ -5616,7 +5616,6 @@ int __init cgroup_init(void) int ssid; BUILD_BUG_ON(CGROUP_SUBSYS_COUNT > 16); - BUG_ON(percpu_init_rwsem(&cgroup_threadgroup_rwsem)); BUG_ON(cgroup_init_cftypes(NULL, cgroup_base_files)); BUG_ON(cgroup_init_cftypes(NULL, cgroup1_base_files)); |