diff options
| author | Linus Torvalds | 2019-06-02 17:51:30 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2019-06-02 17:51:30 +0200 |
| commit | 7b3064f0e8deb55b8655dd8d36d9d1e8fb62b71b (patch) | |
| tree | a991e83f2711bc4ee1ca7daa868fc269637b6d45 /include/linux/cgroup-defs.h | |
| parent | Merge tag 'nfsd-5.2-1' of git://linux-nfs.org/~bfields/linux (diff) | |
| parent | mm, compaction: make sure we isolate a valid PFN (diff) | |
| download | kernel-qcow2-linux-7b3064f0e8deb55b8655dd8d36d9d1e8fb62b71b.tar.gz kernel-qcow2-linux-7b3064f0e8deb55b8655dd8d36d9d1e8fb62b71b.tar.xz kernel-qcow2-linux-7b3064f0e8deb55b8655dd8d36d9d1e8fb62b71b.zip | |
Merge branch 'akpm' (patches from Andrew)
Merge misc fixes from Andrew Morton:
"Various fixes and followups"
* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
mm, compaction: make sure we isolate a valid PFN
include/linux/generic-radix-tree.h: fix kerneldoc comment
kernel/signal.c: trace_signal_deliver when signal_group_exit
drivers/iommu/intel-iommu.c: fix variable 'iommu' set but not used
spdxcheck.py: fix directory structures
kasan: initialize tag to 0xff in __kasan_kmalloc
z3fold: fix sheduling while atomic
scripts/gdb: fix invocation when CONFIG_COMMON_CLK is not set
mm/gup: continue VM_FAULT_RETRY processing even for pre-faults
ocfs2: fix error path kobject memory leak
memcg: make it work on sparse non-0-node systems
mm, memcg: consider subtrees in memory.events
prctl_set_mm: downgrade mmap_sem to read lock
prctl_set_mm: refactor checks from validate_prctl_map
kernel/fork.c: make max_threads symbol static
arch/arm/boot/compressed/decompress.c: fix build error due to lz4 changes
arch/parisc/configs/c8000_defconfig: remove obsoleted CONFIG_DEBUG_SLAB_LEAK
mm/vmalloc.c: fix typo in comment
lib/sort.c: fix kernel-doc notation warnings
mm: fix Documentation/vm/hmm.rst Sphinx warnings
Diffstat (limited to 'include/linux/cgroup-defs.h')
| -rw-r--r-- | include/linux/cgroup-defs.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/include/linux/cgroup-defs.h b/include/linux/cgroup-defs.h index 77258d276f93..11e215d7937e 100644 --- a/include/linux/cgroup-defs.h +++ b/include/linux/cgroup-defs.h @@ -89,6 +89,11 @@ enum { * Enable cpuset controller in v1 cgroup to use v2 behavior. */ CGRP_ROOT_CPUSET_V2_MODE = (1 << 4), + + /* + * Enable legacy local memory.events. + */ + CGRP_ROOT_MEMORY_LOCAL_EVENTS = (1 << 5), }; /* cftype->flags */ |