git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-4.13-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj...
[sfrench/cifs-2.6.git]
/
kernel
/
cgroup
/
cpuset.c
diff --git
a/kernel/cgroup/cpuset.c
b/kernel/cgroup/cpuset.c
index 8d51516885047c7807cb050979c1ebbdaec6dc07..87a1213dd32678fba0487b7411dc4af5661cf01e 100644
(file)
--- 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,
},
{