mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-16 07:35:14 +00:00
staging: ion: remove order argument from free_buffer_page()
Now that the pages returned from the pool are compound pages, we do not need to pass the order information to free_buffer_page(). Signed-off-by: Heesub Shin <heesub.shin@samsung.com> Reviewed-by: Mitchel Humpherys <mitchelh@codeaurora.org> Tested-by: John Stultz <john.stultz@linaro.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
7eb88bffbd
commit
06566f5dc3
1 changed files with 4 additions and 5 deletions
|
@ -78,9 +78,9 @@ static struct page *alloc_buffer_page(struct ion_system_heap *heap,
|
||||||
}
|
}
|
||||||
|
|
||||||
static void free_buffer_page(struct ion_system_heap *heap,
|
static void free_buffer_page(struct ion_system_heap *heap,
|
||||||
struct ion_buffer *buffer, struct page *page,
|
struct ion_buffer *buffer, struct page *page)
|
||||||
unsigned int order)
|
|
||||||
{
|
{
|
||||||
|
unsigned int order = compound_order(page);
|
||||||
bool cached = ion_buffer_cached(buffer);
|
bool cached = ion_buffer_cached(buffer);
|
||||||
|
|
||||||
if (!cached && !(buffer->private_flags & ION_PRIV_FLAG_SHRINKER_FREE)) {
|
if (!cached && !(buffer->private_flags & ION_PRIV_FLAG_SHRINKER_FREE)) {
|
||||||
|
@ -171,7 +171,7 @@ static int ion_system_heap_allocate(struct ion_heap *heap,
|
||||||
kfree(table);
|
kfree(table);
|
||||||
free_pages:
|
free_pages:
|
||||||
list_for_each_entry_safe(page, tmp_page, &pages, lru)
|
list_for_each_entry_safe(page, tmp_page, &pages, lru)
|
||||||
free_buffer_page(sys_heap, buffer, page, compound_order(page));
|
free_buffer_page(sys_heap, buffer, page);
|
||||||
return -ENOMEM;
|
return -ENOMEM;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -191,8 +191,7 @@ static void ion_system_heap_free(struct ion_buffer *buffer)
|
||||||
ion_heap_buffer_zero(buffer);
|
ion_heap_buffer_zero(buffer);
|
||||||
|
|
||||||
for_each_sg(table->sgl, sg, table->nents, i)
|
for_each_sg(table->sgl, sg, table->nents, i)
|
||||||
free_buffer_page(sys_heap, buffer, sg_page(sg),
|
free_buffer_page(sys_heap, buffer, sg_page(sg));
|
||||||
get_order(sg->length));
|
|
||||||
sg_free_table(table);
|
sg_free_table(table);
|
||||||
kfree(table);
|
kfree(table);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue