diff options
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/memcontrol.h | 5 | ||||
-rw-r--r-- | include/linux/vm_event_item.h | 1 |
2 files changed, 5 insertions, 1 deletions
diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h index b2a5b1cd4e55..72d0853beb31 100644 --- a/include/linux/memcontrol.h +++ b/include/linux/memcontrol.h | |||
@@ -582,8 +582,11 @@ static inline void count_memcg_event_mm(struct mm_struct *mm, | |||
582 | 582 | ||
583 | rcu_read_lock(); | 583 | rcu_read_lock(); |
584 | memcg = mem_cgroup_from_task(rcu_dereference(mm->owner)); | 584 | memcg = mem_cgroup_from_task(rcu_dereference(mm->owner)); |
585 | if (likely(memcg)) | 585 | if (likely(memcg)) { |
586 | this_cpu_inc(memcg->stat->events[idx]); | 586 | this_cpu_inc(memcg->stat->events[idx]); |
587 | if (idx == OOM_KILL) | ||
588 | cgroup_file_notify(&memcg->events_file); | ||
589 | } | ||
587 | rcu_read_unlock(); | 590 | rcu_read_unlock(); |
588 | } | 591 | } |
589 | #ifdef CONFIG_TRANSPARENT_HUGEPAGE | 592 | #ifdef CONFIG_TRANSPARENT_HUGEPAGE |
diff --git a/include/linux/vm_event_item.h b/include/linux/vm_event_item.h index be3ab2d13adf..37e8d31a4632 100644 --- a/include/linux/vm_event_item.h +++ b/include/linux/vm_event_item.h | |||
@@ -41,6 +41,7 @@ enum vm_event_item { PGPGIN, PGPGOUT, PSWPIN, PSWPOUT, | |||
41 | KSWAPD_LOW_WMARK_HIT_QUICKLY, KSWAPD_HIGH_WMARK_HIT_QUICKLY, | 41 | KSWAPD_LOW_WMARK_HIT_QUICKLY, KSWAPD_HIGH_WMARK_HIT_QUICKLY, |
42 | PAGEOUTRUN, PGROTATED, | 42 | PAGEOUTRUN, PGROTATED, |
43 | DROP_PAGECACHE, DROP_SLAB, | 43 | DROP_PAGECACHE, DROP_SLAB, |
44 | OOM_KILL, | ||
44 | #ifdef CONFIG_NUMA_BALANCING | 45 | #ifdef CONFIG_NUMA_BALANCING |
45 | NUMA_PTE_UPDATES, | 46 | NUMA_PTE_UPDATES, |
46 | NUMA_HUGE_PTE_UPDATES, | 47 | NUMA_HUGE_PTE_UPDATES, |