From 54a1c40c991e35c31e7413d9bf24e828c3cab6b7 Mon Sep 17 00:00:00 2001 From: Rebecca Schultz Zavin Date: Fri, 27 Aug 2010 14:46:33 -0700 Subject: [PATCH] Revert "staging: android: lowmemkiller: Substantially reduce overhead during reclaim" This reverts commit db0c96452e4c9e2f14e54f1fa648d90ef894bcc6. Conflicts: drivers/staging/android/lowmemorykiller.c Change-Id: Iac522ffa3f751d4ef8d2fb2e0f2e08dee8e6b118 Signed-off-by: Rebecca Schultz Zavin --- drivers/staging/android/lowmemorykiller.c | 43 ----------------------- 1 file changed, 43 deletions(-) diff --git a/drivers/staging/android/lowmemorykiller.c b/drivers/staging/android/lowmemorykiller.c index 1ab3fe1f3ce7..1670a9729931 100644 --- a/drivers/staging/android/lowmemorykiller.c +++ b/drivers/staging/android/lowmemorykiller.c @@ -34,8 +34,6 @@ #include #include #include -#include -#include static uint32_t lowmem_debug_level = 2; static int lowmem_adj[6] = { @@ -53,32 +51,12 @@ static size_t lowmem_minfree[6] = { }; static int lowmem_minfree_size = 4; -static struct task_struct *lowmem_deathpending; - #define lowmem_print(level, x...) \ do { \ if (lowmem_debug_level >= (level)) \ printk(x); \ } while (0) -static int -task_notify_func(struct notifier_block *self, unsigned long val, void *data); - -static struct notifier_block task_nb = { - .notifier_call = task_notify_func, -}; - -static int -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_handoff_unregister(&task_nb); - } - return NOTIFY_OK; -} - static int lowmem_shrink(struct shrinker *s, int nr_to_scan, gfp_t gfp_mask) { struct task_struct *p; @@ -93,18 +71,6 @@ static int lowmem_shrink(struct shrinker *s, int nr_to_scan, gfp_t gfp_mask) int other_free = global_page_state(NR_FREE_PAGES); int other_file = global_page_state(NR_FILE_PAGES); - /* - * If we already have a death outstanding, then - * bail out right away; indicating to vmscan - * 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; - if (lowmem_adj_size < array_size) array_size = lowmem_adj_size; if (lowmem_minfree_size < array_size) @@ -176,15 +142,6 @@ static int lowmem_shrink(struct shrinker *s, 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_handoff_register(&task_nb); -#endif force_sig(SIGKILL, selected); rem -= selected_tasksize; } -- 2.34.1