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

Commit 9eeee244 authored by Jan Beulich's avatar Jan Beulich Committed by Dave Jones
Browse files

[AGPGART] Move [un]map_page_into_agp into asm/agp.h 



Remove an arch-dependent hunk in favor of #define-ing the respective bits in
asm-<arch>/agp.h (allowing easier overriding in para-virtualized environments).

Signed-off-by: default avatarJan Beulich <jbeulich@novell.com>
Signed-off-by: default avatarDave Jones <davej@redhat.com>
parent 77ec430e

drivers/char/agp/generic.c

+0 −22
Original line number Diff line number Diff line
@@ -51,28 +51,6 @@ int agp_memory_reserved; 
 */

EXPORT_SYMBOL_GPL(agp_memory_reserved);



#if defined(CONFIG_X86)

int map_page_into_agp(struct page *page)

{

	int i;

	i = change_page_attr(page, 1, PAGE_KERNEL_NOCACHE);

	/* Caller's responsibility to call global_flush_tlb() for

	 * performance reasons */

	return i;

}

EXPORT_SYMBOL_GPL(map_page_into_agp);



int unmap_page_from_agp(struct page *page)

{

	int i;

	i = change_page_attr(page, 1, PAGE_KERNEL);

	/* Caller's responsibility to call global_flush_tlb() for

	 * performance reasons */

	return i;

}

EXPORT_SYMBOL_GPL(unmap_page_from_agp);

#endif



/*

 * Generic routines for handling agp_memory structures -

 * They use the basic page allocation routines to do the brunt of the work.

include/asm-i386/agp.h

+4 −2
Original line number Diff line number Diff line
@@ -12,8 +12,10 @@ 
 * data corruption on some CPUs.

 */



int map_page_into_agp(struct page *page);

int unmap_page_from_agp(struct page *page);

/* Caller's responsibility to call global_flush_tlb() for

 * performance reasons */

#define map_page_into_agp(page) change_page_attr(page, 1, PAGE_KERNEL_NOCACHE)

#define unmap_page_from_agp(page) change_page_attr(page, 1, PAGE_KERNEL)

#define flush_agp_mappings() global_flush_tlb()



/* Could use CLFLUSH here if the cpu supports it. But then it would

include/asm-x86_64/agp.h

+4 −2
Original line number Diff line number Diff line
@@ -10,8 +10,10 @@ 
 * with different cachability attributes for the same page.

 */



int map_page_into_agp(struct page *page);

int unmap_page_from_agp(struct page *page);

/* Caller's responsibility to call global_flush_tlb() for

 * performance reasons */

#define map_page_into_agp(page) change_page_attr(page, 1, PAGE_KERNEL_NOCACHE)

#define unmap_page_from_agp(page) change_page_attr(page, 1, PAGE_KERNEL)

#define flush_agp_mappings() global_flush_tlb()



/* Could use CLFLUSH here if the cpu supports it. But then it would