|
@@ -687,7 +687,8 @@ void out_of_memory(struct zonelist *zonelist, gfp_t gfp_mask,
|
|
check_panic_on_oom(constraint, gfp_mask, order);
|
|
check_panic_on_oom(constraint, gfp_mask, order);
|
|
|
|
|
|
read_lock(&tasklist_lock);
|
|
read_lock(&tasklist_lock);
|
|
- if (sysctl_oom_kill_allocating_task) {
|
|
|
|
|
|
+ if (sysctl_oom_kill_allocating_task &&
|
|
|
|
+ !oom_unkillable_task(current, NULL, nodemask)) {
|
|
/*
|
|
/*
|
|
* oom_kill_process() needs tasklist_lock held. If it returns
|
|
* oom_kill_process() needs tasklist_lock held. If it returns
|
|
* non-zero, current could not be killed so we must fallback to
|
|
* non-zero, current could not be killed so we must fallback to
|