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

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

ion: allow cached mappings of chunk and system heap buffers 



Now that ion_vm_fault uses vm_insert_pfn instead of vm_insert_page
cached buffers can be supported in any heap.  Remove the checks
in the chunk and system heaps.

Signed-off-by: default avatarColin Cross <ccross@android.com>
Signed-off-by: default avatarJohn Stultz <john.stultz@linaro.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent a3056906

drivers/staging/android/ion/ion_chunk_heap.c

+0 −3
Original line number Diff line number Diff line
@@ -47,9 +47,6 @@ static int ion_chunk_heap_allocate(struct ion_heap *heap, 
	unsigned long num_chunks;

	unsigned long allocated_size;



	if (ion_buffer_fault_user_mappings(buffer))

		return -ENOMEM;



	allocated_size = ALIGN(size, chunk_heap->chunk_size);

	num_chunks = allocated_size / chunk_heap->chunk_size;

drivers/staging/android/ion/ion_system_heap.c

+0 −3
Original line number Diff line number Diff line
@@ -148,9 +148,6 @@ static int ion_system_heap_allocate(struct ion_heap *heap, 
	if (align > PAGE_SIZE)

		return -EINVAL;



	if (ion_buffer_fault_user_mappings(buffer))

		return -EINVAL;



	INIT_LIST_HEAD(&pages);

	while (size_remaining > 0) {

		info = alloc_largest_available(sys_heap, buffer, size_remaining, max_order);