Revision 7d638093d4b0e9ef15bd78f38f11f126e773cc14 authored by Vladimir Davydov on 10 June 2015, 18:14:46 UTC, committed by Linus Torvalds on 10 June 2015, 23:43:43 UTC
When trimming memcg consumption excess (see memory.high), we call
try_to_free_mem_cgroup_pages without checking if we are allowed to sleep
in the current context, which can result in a deadlock. Fix this.
Fixes: 241994ed8649 ("mm: memcontrol: default hierarchy interface for memory")
Signed-off-by: Vladimir Davydov <vdavydov@parallels.com>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Acked-by: Michal Hocko <mhocko@suse.cz>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
1 parent 85bd839
| File | Mode | Size |
|---|---|---|
| Kconfig | -rw-r--r-- | 64.5 KB |
| Makefile | -rw-r--r-- | 1.1 KB |
| calibrate.c | -rw-r--r-- | 8.5 KB |
| do_mounts.c | -rw-r--r-- | 14.5 KB |
| do_mounts.h | -rw-r--r-- | 1.4 KB |
| do_mounts_initrd.c | -rw-r--r-- | 3.4 KB |
| do_mounts_md.c | -rw-r--r-- | 8.2 KB |
| do_mounts_rd.c | -rw-r--r-- | 8.7 KB |
| init_task.c | -rw-r--r-- | 728 bytes |
| initramfs.c | -rw-r--r-- | 13.8 KB |
| main.c | -rw-r--r-- | 24.6 KB |
| noinitramfs.c | -rw-r--r-- | 1.5 KB |
| version.c | -rw-r--r-- | 1.2 KB |
Computing file changes ...
