diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-05-30 13:37:00 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-05-30 13:37:00 +1000 |
| commit | 12e1adb5c3cdb925da16a92d6bd4b33107a51c5a (patch) | |
| tree | a26cd2143707ef80b225a11a0ee6f5ddd7f211ff /kernel/cgroup/cpuset.c | |
| parent | 8456fabfce852ba7a9c1a80c260a68d6127c8c4a (diff) | |
| parent | 41c25707d21716826e3c1f60967f5550610ec1c9 (diff) | |
Merge remote-tracking branch 'cgroup/for-next'
Diffstat (limited to 'kernel/cgroup/cpuset.c')
| -rw-r--r-- | kernel/cgroup/cpuset.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/cgroup/cpuset.c b/kernel/cgroup/cpuset.c index f6501f4f6040..ae643412948a 100644 --- a/kernel/cgroup/cpuset.c +++ b/kernel/cgroup/cpuset.c @@ -176,9 +176,9 @@ typedef enum { } cpuset_flagbits_t; /* convenient tests for these bits */ -static inline bool is_cpuset_online(const struct cpuset *cs) +static inline bool is_cpuset_online(struct cpuset *cs) { - return test_bit(CS_ONLINE, &cs->flags); + return test_bit(CS_ONLINE, &cs->flags) && !css_is_dying(&cs->css); } static inline int is_cpu_exclusive(const struct cpuset *cs) |