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

Commit 3113856b authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ion: ensure prefetch/drain requests are processed in order"

parents e04e9098 f5a93341

drivers/staging/android/ion/ion_system_secure_heap.c

+2 −2
Original line number Diff line number Diff line 
/*

 *

 * Copyright (c) 2014-2018, The Linux Foundation. All rights reserved.

 * Copyright (c) 2014-2019, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -285,7 +285,7 @@ static int __ion_system_secure_heap_resize(struct ion_heap *heap, void *ptr, 
		spin_unlock_irqrestore(&secure_heap->work_lock, flags);

		goto out_free;

	}

	list_splice_init(&items, &secure_heap->prefetch_list);

	list_splice_tail_init(&items, &secure_heap->prefetch_list);

	queue_delayed_work(system_unbound_wq, &secure_heap->prefetch_work,

			   shrink ?  msecs_to_jiffies(SHRINK_DELAY) : 0);

	spin_unlock_irqrestore(&secure_heap->work_lock, flags);