X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=include%2Fasm-ia64%2Fagp.h;fp=include%2Fasm-ia64%2Fagp.h;h=e0bf8a4ab1a05c8dcaa836c2c41aabe543a559eb;hb=e0ff8aa1acd079b70e796571917ae0449b7c465b;hp=9458f58ade4af8ab916f0e3145019cc87f62f5e8;hpb=bef9ea3086d47cf98cfd0ea389953a0af0b60114;p=linux-2.6.git

diff --git a/include/asm-ia64/agp.h b/include/asm-ia64/agp.h
index 9458f58ad..e0bf8a4ab 100644
--- a/include/asm-ia64/agp.h
+++ b/include/asm-ia64/agp.h
@@ -28,7 +28,12 @@
 #endif
 
 /* GATT allocation. Returns/accepts GATT kernel virtual address. */
-#ifdef CONFIG_XEN
+#ifndef CONFIG_XEN
+#define alloc_gatt_pages(order)		\
+	((char *)__get_free_pages(GFP_KERNEL, (order)))
+#define free_gatt_pages(table, order)	\
+	free_pages((unsigned long)(table), (order))
+#else
 #include <asm/hypervisor.h>
 static inline char*
 alloc_gatt_pages(unsigned int order)
@@ -52,16 +57,6 @@ free_gatt_pages(void* table, unsigned int order)
 	xen_destroy_contiguous_region((unsigned long)table, order);
 	free_pages((unsigned long)table, order);
 }
-#else	/* CONFIG_XEN */
-/* 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	/* CONFIG_XEN */
+#endif /* CONFIG_XEN */
 
 #endif /* _ASM_IA64_AGP_H */