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

Commit da931a93 authored by Dave Airlie's avatar Dave Airlie
Browse files

agp: drop vmalloc flag. 



Since the code that was too ugly to live is upstream, we can use it now,
instead of rolling our own.

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent f5c5f040

drivers/char/agp/generic.c

+1 −3
Original line number Diff line number Diff line
@@ -97,20 +97,18 @@ EXPORT_SYMBOL(agp_flush_chipset); 
void agp_alloc_page_array(size_t size, struct agp_memory *mem)

{

	mem->pages = NULL;

	mem->vmalloc_flag = false;



	if (size <= 2*PAGE_SIZE)

		mem->pages = kmalloc(size, GFP_KERNEL | __GFP_NORETRY);

	if (mem->pages == NULL) {

		mem->pages = vmalloc(size);

		mem->vmalloc_flag = true;

	}

}

EXPORT_SYMBOL(agp_alloc_page_array);



void agp_free_page_array(struct agp_memory *mem)

{

	if (mem->vmalloc_flag) {

	if (is_vmalloc_addr(mem->pages)) {

		vfree(mem->pages);

	} else {

		kfree(mem->pages);

include/linux/agp_backend.h

+0 −1
Original line number Diff line number Diff line
@@ -79,7 +79,6 @@ struct agp_memory { 
	u32 physical;

	bool is_bound;

	bool is_flushed;

	bool vmalloc_flag;

	/* list of agp_memory mapped to the aperture */

	struct list_head mapped_list;

	/* DMA-mapped addresses */