Merge with ../linux-2.6-smp

[linux-2.6] / include / asm-i386 / agp.h

diff --git a/include/asm-i386/agp.h b/include/asm-i386/agp.h
index a917ff50354f363b69b909099cfbdcca1fed20ab..b82f5f3ab887b4307fa2e248c2122bdfe8d32bfc 100644 (file)
--- a/include/asm-i386/agp.h
+++ b/include/asm-i386/agp.h
@@ -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