Merge branch 'for-4.13-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 29 Aug 2017 18:16:21 +0000 (11:16 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 29 Aug 2017 18:16:21 +0000 (11:16 -0700)
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

1  2 
kernel/cgroup/cpuset.c

diff --combined kernel/cgroup/cpuset.c
index 8d51516885047c7807cb050979c1ebbdaec6dc07,8362bac0d1793d14c67c14ca110e98e5a3496b22..87a1213dd32678fba0487b7411dc4af5661cf01e
@@@ -63,7 -63,6 +63,7 @@@
  #include <linux/cgroup.h>
  #include <linux/wait.h>
  
 +DEFINE_STATIC_KEY_FALSE(cpusets_pre_enable_key);
  DEFINE_STATIC_KEY_FALSE(cpusets_enabled_key);
  
  /* See "Frequency meter" comments, below. */
@@@ -1892,6 -1891,7 +1892,7 @@@ static struct cftype files[] = 
        {
                .name = "memory_pressure",
                .read_u64 = cpuset_read_u64,
+               .private = FILE_MEMORY_PRESSURE,
        },
  
        {