Merge branch 'for-4.13-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup

torvalds · torvalds · commit 36fde05f3fb5 · 2017-08-29T11:16:21.000-07:00
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
diff --git 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,
 	},
 
 	{

Original file line number	Diff line number	Diff line change
`@@ -1892,6 +1892,7 @@ static struct cftype files[] = {`
`1892`	`1892`	`{`
`1893`	`1893`	`.name = "memory_pressure",`
`1894`	`1894`	`.read_u64 = cpuset_read_u64,`
	`1895`	`+ .private = FILE_MEMORY_PRESSURE,`
`1895`	`1896`	`},`
`1896`	`1897`
`1897`	`1898`	`{`