diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2016-09-01 12:33:46 -0400 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2016-09-01 12:33:46 -0400 |
commit | 0cb7bf61b1e9f05027de58c80f9b46a714d24e35 (patch) | |
tree | 41fb55cf62d07b425122f9a8b96412c0d8eb99c5 /mm/oom_kill.c | |
parent | aa877175e7a9982233ed8f10cb4bfddd78d82741 (diff) | |
parent | 3eab887a55424fc2c27553b7bfe32330df83f7b8 (diff) |
Merge branch 'linus' into smp/hotplug
Apply upstream changes to avoid conflicts with pending patches.
Diffstat (limited to 'mm/oom_kill.c')
-rw-r--r-- | mm/oom_kill.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/oom_kill.c b/mm/oom_kill.c index 7d0a275df822..d53a9aa00977 100644 --- a/mm/oom_kill.c +++ b/mm/oom_kill.c | |||
@@ -764,7 +764,7 @@ bool task_will_free_mem(struct task_struct *task) | |||
764 | { | 764 | { |
765 | struct mm_struct *mm = task->mm; | 765 | struct mm_struct *mm = task->mm; |
766 | struct task_struct *p; | 766 | struct task_struct *p; |
767 | bool ret; | 767 | bool ret = true; |
768 | 768 | ||
769 | /* | 769 | /* |
770 | * Skip tasks without mm because it might have passed its exit_mm and | 770 | * Skip tasks without mm because it might have passed its exit_mm and |