Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cae9bf11 authored by Colin Cross's avatar Colin Cross Committed by Greg Kroah-Hartman
Browse files

android: lowmemorykiller: Fix arguments to lowmem_shrink 



The arguments to shrink functions have changed, update
lowmem_shrink to match.

Signed-off-by: default avatarColin Cross <ccross@android.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 71b2c82b

drivers/staging/android/lowmemorykiller.c

+9 −9
Original line number Diff line number Diff line
@@ -79,7 +79,7 @@ task_notify_func(struct notifier_block *self, unsigned long val, void *data) 
	return NOTIFY_OK;

}



static int lowmem_shrink(struct shrinker *s, int nr_to_scan, gfp_t gfp_mask)

static int lowmem_shrink(struct shrinker *s, struct shrink_control *sc)

{

	struct task_struct *p;

	struct task_struct *selected = NULL;
@@ -117,17 +117,17 @@ static int lowmem_shrink(struct shrinker *s, int nr_to_scan, gfp_t gfp_mask) 
			break;

		}

	}

	if (nr_to_scan > 0)

		lowmem_print(3, "lowmem_shrink %d, %x, ofree %d %d, ma %d\n",

			     nr_to_scan, gfp_mask, other_free, other_file,

	if (sc->nr_to_scan > 0)

		lowmem_print(3, "lowmem_shrink %lu, %x, ofree %d %d, ma %d\n",

			     sc->nr_to_scan, sc->gfp_mask, other_free, other_file,

			     min_adj);

	rem = global_page_state(NR_ACTIVE_ANON) +

		global_page_state(NR_ACTIVE_FILE) +

		global_page_state(NR_INACTIVE_ANON) +

		global_page_state(NR_INACTIVE_FILE);

	if (nr_to_scan <= 0 || min_adj == OOM_ADJUST_MAX + 1) {

		lowmem_print(5, "lowmem_shrink %d, %x, return %d\n",

			     nr_to_scan, gfp_mask, rem);

	if (sc->nr_to_scan <= 0 || min_adj == OOM_ADJUST_MAX + 1) {

		lowmem_print(5, "lowmem_shrink %lu, %x, return %d\n",

			     sc->nr_to_scan, sc->gfp_mask, rem);

		return rem;

	}

	selected_oom_adj = min_adj;
@@ -183,8 +183,8 @@ static int lowmem_shrink(struct shrinker *s, int nr_to_scan, gfp_t gfp_mask) 
		force_sig(SIGKILL, selected);

		rem -= selected_tasksize;

	}

	lowmem_print(4, "lowmem_shrink %d, %x, return %d\n",

		     nr_to_scan, gfp_mask, rem);

	lowmem_print(4, "lowmem_shrink %lu, %x, return %d\n",

		     sc->nr_to_scan, sc->gfp_mask, rem);

	read_unlock(&tasklist_lock);

	return rem;

}