diff options
Diffstat (limited to 'mm')
| -rw-r--r-- | mm/mmap.c | 1 | ||||
| -rw-r--r-- | mm/oom_kill.c | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/mm/mmap.c b/mm/mmap.c index 3f48d0928e6b..1e8fdb0b51ed 100644 --- a/mm/mmap.c +++ b/mm/mmap.c @@ -2935,7 +2935,6 @@ EXPORT_SYMBOL(vm_munmap); SYSCALL_DEFINE2(munmap, unsigned long, addr, size_t, len) { addr = untagged_addr(addr); - profile_munmap(addr); return __vm_munmap(addr, len, true); } diff --git a/mm/oom_kill.c b/mm/oom_kill.c index 3934ff500878..832fb330376e 100644 --- a/mm/oom_kill.c +++ b/mm/oom_kill.c @@ -793,7 +793,7 @@ static inline bool __task_will_free_mem(struct task_struct *task) * coredump_task_exit(), so the oom killer cannot assume that * the process will promptly exit and release memory. */ - if (sig->flags & SIGNAL_GROUP_COREDUMP) + if (sig->core_state) return false; if (sig->flags & SIGNAL_GROUP_EXIT) |