git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
use clear_page()/copy_page() in favor of memset()/memcpy() on whole pages
[pandora-kernel.git]
/
fs
/
exec.c
diff --git
a/fs/exec.c
b/fs/exec.c
index
6d2b6f9
..
3aa75b8
100644
(file)
--- a/
fs/exec.c
+++ b/
fs/exec.c
@@
-54,6
+54,7
@@
#include <linux/fsnotify.h>
#include <linux/fs_struct.h>
#include <linux/pipe_fs_i.h>
#include <linux/fsnotify.h>
#include <linux/fs_struct.h>
#include <linux/pipe_fs_i.h>
+#include <linux/oom.h>
#include <asm/uaccess.h>
#include <asm/mmu_context.h>
#include <asm/uaccess.h>
#include <asm/mmu_context.h>
@@
-759,6
+760,10
@@
static int exec_mmap(struct mm_struct *mm)
tsk->mm = mm;
tsk->active_mm = mm;
activate_mm(active_mm, mm);
tsk->mm = mm;
tsk->active_mm = mm;
activate_mm(active_mm, mm);
+ if (old_mm && tsk->signal->oom_score_adj == OOM_SCORE_ADJ_MIN) {
+ atomic_dec(&old_mm->oom_disable_count);
+ atomic_inc(&tsk->mm->oom_disable_count);
+ }
task_unlock(tsk);
arch_pick_mmap_layout(mm);
if (old_mm) {
task_unlock(tsk);
arch_pick_mmap_layout(mm);
if (old_mm) {