github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-08 22:52:35 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

Revert "staging: android: lowmemorykiller: Fix task_struct leak"

Browse Source 
This reverts commit 896c969afc.
This commit is contained in:
黄涛 2011-07-30 22:16:31 +08:00
parent bd9ac29b9c
commit d7473f13a3
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/staging/android/lowmemorykiller.c
View File

@ -34,6 +34,7 @@
#include <linux/mm.h>
#include <linux/oom.h>
#include <linux/sched.h>
#include <linux/profile.h>
#include <linux/notifier.h>
static uint32_t lowmem_debug_level = 2;
@ -73,7 +74,7 @@ task_notify_func(struct notifier_block *self, unsigned long val, void *data)
struct task_struct *task = data;
if (task == lowmem_deathpending) {
lowmem_deathpending = NULL;
task_free_unregister(&task_nb);
task_handoff_unregister(&task_nb);
}
return NOTIFY_OK;
}
@ -98,6 +99,8 @@ static int lowmem_shrink(int nr_to_scan, gfp_t gfp_mask)
* that we have nothing further to offer on
* this pass.
*
* Note: Currently you need CONFIG_PROFILING
* for this to work correctly.
*/
if (lowmem_deathpending)
return 0;
@ -173,8 +176,15 @@ static int lowmem_shrink(int nr_to_scan, gfp_t gfp_mask)
lowmem_print(1, "send sigkill to %d (%s), adj %d, size %d\n",
selected->pid, selected->comm,
selected_oom_adj, selected_tasksize);
/*
* If CONFIG_PROFILING is off, then task_handoff_register()
* is a nop. In that case we don't want to stall the killer
* by setting lowmem_deathpending.
*/
#ifdef CONFIG_PROFILING
lowmem_deathpending = selected;
task_free_register(&task_nb);
task_handoff_register(&task_nb);
#endif
force_sig(SIGKILL, selected);
rem -= selected_tasksize;
}