Merge of master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart

This commit is contained in:
Linus Torvalds 2005-06-07 13:41:30 -07:00
commit eba4f669d6
22 changed files with 133 additions and 56 deletions

View file

@ -21,4 +21,14 @@ int unmap_page_from_agp(struct page *page);
worth it. Would need a page for it. */
#define flush_agp_cache() asm volatile("wbinvd":::"memory")
/* 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)))
#define free_gatt_pages(table, order) \
free_pages((unsigned long)(table), (order))
#endif