diff options
| author | Waiman Long <longman@redhat.com> | 2017-08-24 12:04:29 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-09-07 08:34:09 +0200 |
| commit | ed48d9230e303aaff037d60fd866088c114184e5 (patch) | |
| tree | 88fae945b12d8d72c1e8447698fe072fa7ca8c94 /kernel | |
| parent | 15e94ec4ec2155cae1e0de64b5ea16277c21daf8 (diff) | |
| download | linux-stable-ed48d9230e303aaff037d60fd866088c114184e5.tar.gz linux-stable-ed48d9230e303aaff037d60fd866088c114184e5.tar.bz2 linux-stable-ed48d9230e303aaff037d60fd866088c114184e5.zip | |
cpuset: Fix incorrect memory_pressure control file mapping
commit 1c08c22c874ac88799cab1f78c40f46110274915 upstream.
The memory_pressure control file was incorrectly set up without
a private value (0, by default). As a result, this control
file was treated like memory_migrate on read. By adding back the
FILE_MEMORY_PRESSURE private value, the correct memory pressure value
will be returned.
Signed-off-by: Waiman Long <longman@redhat.com>
Signed-off-by: Tejun Heo <tj@kernel.org>
Fixes: 7dbdb199d3bf ("cgroup: replace cftype->mode with CFTYPE_WORLD_WRITABLE")
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/cpuset.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel/cpuset.c b/kernel/cpuset.c index 8ccd66a97c8b..2924b6faa469 100644 --- a/kernel/cpuset.c +++ b/kernel/cpuset.c @@ -1910,6 +1910,7 @@ static struct cftype files[] = { { .name = "memory_pressure", .read_u64 = cpuset_read_u64, + .private = FILE_MEMORY_PRESSURE, }, { |