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

Commit 66a4fe0c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'agp-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/agp-2.6 

* 'agp-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/agp-2.6:
  agp/intel: remove restore in resume
  agp: fix uninorth build
  intel-agp: Set dma mask for i915
  agp: kill phys_to_gart() and gart_to_phys()
  intel-agp: fix sglist allocation to avoid vmalloc()
  intel-agp: Move repeated sglist free into separate function
  agp: Switch agp_{un,}map_page() to take struct page * argument
  agp: tidy up handling of scratch pages w.r.t. DMA API
  intel_agp: Use PCI DMA API correctly on chipsets new enough to have IOMMU
  agp: Add generic support for graphics dma remapping
  agp: Switch mask_memory() method to take address argument again, not page
parents 18240904 12126482

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)))