From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 29 Aug 2017 18:16:21 +0000 (-0700)
Subject: Merge branch 'for-4.13-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj... 
X-Git-Tag: cifs-fixes-for-4.13-rc7-and-stable~2
X-Git-Url: http://git.samba.org/samba.git/?p=sfrench%2Fcifs-2.6.git;a=commitdiff_plain;h=36fde05f3fb51edea879636db590d70e11f16c82;hp=-c

Merge branch 'for-4.13-fixes' of git://git./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
---

36fde05f3fb51edea879636db590d70e11f16c82
diff --combined kernel/cgroup/cpuset.c
index 8d5151688504,8362bac0d179..87a1213dd326
--- a/kernel/cgroup/cpuset.c
+++ b/kernel/cgroup/cpuset.c
@@@ -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,
  	},
  
  	{