diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-08-29 11:16:21 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-08-29 11:16:21 -0700 |
| commit | 36fde05f3fb51edea879636db590d70e11f16c82 (patch) | |
| tree | c7c707541f7ebcd0acf77faf9c8d6995dfd8be18 /kernel/cgroup/cpuset.c | |
| parent | 31a3faf3229697d646eab0fc942b24d73b0bcfa1 (diff) | |
| parent | 1c08c22c874ac88799cab1f78c40f46110274915 (diff) | |
| download | linux-36fde05f3fb51edea879636db590d70e11f16c82.tar.bz2 | |
Merge branch 'for-4.13-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup
Pull cgroup fix from Tejun Heo:
"A late but obvious fix for cgroup.
I broke the 'cpuset.memory_pressure' file a long time ago (v4.4) by
accidentally deleting its file index, which made it a duplicate of the
'cpuset.memory_migrate' file. Spotted and fixed by Waiman"
* 'for-4.13-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup:
cpuset: Fix incorrect memory_pressure control file mapping
Diffstat (limited to 'kernel/cgroup/cpuset.c')
| -rw-r--r-- | kernel/cgroup/cpuset.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel/cgroup/cpuset.c b/kernel/cgroup/cpuset.c index 8d5151688504..87a1213dd326 100644 --- a/kernel/cgroup/cpuset.c +++ b/kernel/cgroup/cpuset.c @@ -1892,6 +1892,7 @@ static struct cftype files[] = { { .name = "memory_pressure", .read_u64 = cpuset_read_u64, + .private = FILE_MEMORY_PRESSURE, }, { |