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

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

Merge "staging: android: ion: Track total memory allocations per heap"

parents a7861c3a 986dc35b

drivers/staging/android/ion/ion.c

+2 −0
Original line number Diff line number Diff line
@@ -168,6 +168,7 @@ static struct ion_buffer *ion_buffer_create(struct ion_heap *heap, 
	mutex_lock(&dev->buffer_lock);

	ion_buffer_add(dev, buffer);

	mutex_unlock(&dev->buffer_lock);

	atomic_long_add(len, &heap->total_allocated);

	return buffer;



err1:
@@ -196,6 +197,7 @@ static void _ion_buffer_destroy(struct ion_buffer *buffer) 
	rb_erase(&buffer->node, &dev->buffers);

	mutex_unlock(&dev->buffer_lock);



	atomic_long_sub(buffer->size, &buffer->heap->total_allocated);

	if (heap->flags & ION_HEAP_FLAG_DEFER_FREE)

		ion_heap_freelist_add(heap, buffer);

	else

drivers/staging/android/ion/ion.h

+1 −0
Original line number Diff line number Diff line
@@ -240,6 +240,7 @@ struct ion_heap { 
	spinlock_t free_lock;

	wait_queue_head_t waitqueue;

	struct task_struct *task;

	atomic_long_t total_allocated;



	int (*debug_show)(struct ion_heap *heap, struct seq_file *, void *);

};