Turn DEFINE_STATIC_PERCPU_RWSEM() into __DEFINE_PERCPU_RWSEM() with the additional "is_static" argument to introduce DEFINE_PERCPU_RWSEM(). Change cgroup.c to use DEFINE_PERCPU_RWSEM(cgroup_threadgroup_rwsem).
Unified · Split
| @@ -17,14 +17,18 @@ struct percpu_rw_semaphore { · 16 unmodified lines | ||
| 17 | 17 | int readers_block; |
| 18 | 18 | }; |
| 19 | 19 | |
| 20 | −#define DEFINE_STATIC_PERCPU_RWSEM(name) \ | |
| 20 | +#define __DEFINE_PERCPU_RWSEM(name, is_static) \ | |
| 21 | 21 | static DEFINE_PER_CPU(unsigned int, __percpu_rwsem_rc_##name); \ |
| 22 | −static struct percpu_rw_semaphore name = { \ | |
| 22 | +is_static struct percpu_rw_semaphore name = { \ | |
| 23 | 23 | .rss = __RCU_SYNC_INITIALIZER(name.rss), \ |
| 24 | 24 | .read_count = &__percpu_rwsem_rc_##name, \ |
| 25 | 25 | .rw_sem = __RWSEM_INITIALIZER(name.rw_sem), \ |
| 26 | 26 | .writer = __RCUWAIT_INITIALIZER(name.writer), \ |
| 27 | 27 | } |
| 28 | +#define DEFINE_PERCPU_RWSEM(name) \ | |
| 29 | + __DEFINE_PERCPU_RWSEM(name, /* not static */) | |
| 30 | +#define DEFINE_STATIC_PERCPU_RWSEM(name) \ | |
| 31 | + __DEFINE_PERCPU_RWSEM(name, static) | |
| 28 | 32 | |
| 29 | 33 | extern int __percpu_down_read(struct percpu_rw_semaphore *, int); |
| 30 | 34 | extern void __percpu_up_read(struct percpu_rw_semaphore *); |
| @@ -101,7 +101,7 @@ static DEFINE_SPINLOCK(cgroup_idr_lock); · 100 unmodified lines | ||
| 101 | 101 | */ |
| 102 | 102 | static DEFINE_SPINLOCK(cgroup_file_kn_lock); |
| 103 | 103 | |
| 104 | −struct percpu_rw_semaphore cgroup_threadgroup_rwsem; | |
| 104 | +DEFINE_PERCPU_RWSEM(cgroup_threadgroup_rwsem); | |
| 105 | 105 | |
| 106 | 106 | #define cgroup_assert_mutex_or_rcu_locked() \ |
| 107 | 107 | RCU_LOCKDEP_WARN(!rcu_read_lock_held() && \ |
| @@ -5616,7 +5616,6 @@ int __init cgroup_init(void) · 5508 unmodified lines | ||
| 5616 | 5616 | int ssid; |
| 5617 | 5617 | |
| 5618 | 5618 | BUILD_BUG_ON(CGROUP_SUBSYS_COUNT > 16); |
| 5619 | − BUG_ON(percpu_init_rwsem(&cgroup_threadgroup_rwsem)); | |
| 5620 | 5619 | BUG_ON(cgroup_init_cftypes(NULL, cgroup_base_files)); |
| 5621 | 5620 | BUG_ON(cgroup_init_cftypes(NULL, cgroup1_base_files)); |
| 5622 | 5621 | |