| From eb943f6be011b33455b767880e13c34a2bb96a5e Mon Sep 17 00:00:00 2001 |
| From: San Mehat <san@google.com> |
| Date: Thu, 6 May 2010 15:43:46 -0700 |
| Subject: staging: android: lowmemorykiller: Remove bitrotted codepath |
| Patch-mainline: HEAD |
| Git-commit: eb943f6be011b33455b767880e13c34a2bb96a5e |
| |
| Now that we're murder-synchronous, this code path will never be |
| called (and if it does, it doesn't tell us anything useful other |
| than we killed a task that was already being killed by somebody |
| else but hadn't gotten its' signal yet) |
| |
| Signed-off-by: San Mehat <san@google.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> |
| |
| diff --git a/drivers/staging/android/lowmemorykiller.c b/drivers/staging/android/lowmemorykiller.c |
| index 4523093..cf79eb9 100644 |
| --- a/drivers/staging/android/lowmemorykiller.c |
| +++ b/drivers/staging/android/lowmemorykiller.c |
| @@ -167,12 +167,6 @@ static int lowmem_shrink(int nr_to_scan, gfp_t gfp_mask) |
| p->pid, p->comm, oom_adj, tasksize); |
| } |
| if (selected) { |
| - if (fatal_signal_pending(selected)) { |
| - pr_warning("process %d is suffering a slow death\n", |
| - selected->pid); |
| - read_unlock(&tasklist_lock); |
| - return rem; |
| - } |
| lowmem_print(1, "send sigkill to %d (%s), adj %d, size %d\n", |
| selected->pid, selected->comm, |
| selected_oom_adj, selected_tasksize); |
