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

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

Merge git://git.infradead.org/~dwmw2/iommu-agp into agp-next

parents 90bc1a65 6a12235c

arch/alpha/include/asm/agp.h

+0 −4
Original line number Diff line number Diff line
@@ -9,10 +9,6 @@ 
#define unmap_page_from_agp(page) 

#define flush_agp_cache() mb()



/* Convert a physical address to an address suitable for the GART. */

#define phys_to_gart(x) (x)

#define gart_to_phys(x) (x)



/* GATT allocation. Returns/accepts GATT kernel virtual address. */

#define alloc_gatt_pages(order)		\

	((char *)__get_free_pages(GFP_KERNEL, (order)))

arch/ia64/include/asm/agp.h

+0 −4
Original line number Diff line number Diff line
@@ -17,10 +17,6 @@ 
#define unmap_page_from_agp(page)	/* nothing */

#define flush_agp_cache()		mb()



/* Convert a physical address to an address suitable for the GART. */

#define phys_to_gart(x) (x)

#define gart_to_phys(x) (x)



/* GATT allocation. Returns/accepts GATT kernel virtual address. */

#define alloc_gatt_pages(order)		\

	((char *)__get_free_pages(GFP_KERNEL, (order)))

arch/parisc/include/asm/agp.h

+0 −4
Original line number Diff line number Diff line
@@ -11,10 +11,6 @@ 
#define unmap_page_from_agp(page)	/* nothing */

#define flush_agp_cache()		mb()



/* Convert a physical address to an address suitable for the GART. */

#define phys_to_gart(x) (x)

#define gart_to_phys(x) (x)



/* GATT allocation. Returns/accepts GATT kernel virtual address. */

#define alloc_gatt_pages(order)		\

	((char *)__get_free_pages(GFP_KERNEL, (order)))

arch/powerpc/include/asm/agp.h

+0 −4
Original line number Diff line number Diff line
@@ -8,10 +8,6 @@ 
#define unmap_page_from_agp(page)

#define flush_agp_cache() mb()



/* Convert a physical address to an address suitable for the GART. */

#define phys_to_gart(x) (x)

#define gart_to_phys(x) (x)



/* GATT allocation. Returns/accepts GATT kernel virtual address. */

#define alloc_gatt_pages(order)		\

	((char *)__get_free_pages(GFP_KERNEL, (order)))

arch/sparc/include/asm/agp.h

+0 −4
Original line number Diff line number Diff line
@@ -7,10 +7,6 @@ 
#define unmap_page_from_agp(page)

#define flush_agp_cache() mb()



/* Convert a physical address to an address suitable for the GART. */

#define phys_to_gart(x) (x)

#define gart_to_phys(x) (x)



/* GATT allocation. Returns/accepts GATT kernel virtual address. */

#define alloc_gatt_pages(order)		\

	((char *)__get_free_pages(GFP_KERNEL, (order)))