linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / include / asm-ia64 / agp.h

diff --git a/include/asm-ia64/agp.h b/include/asm-ia64/agp.h
index e0bf8a4..4e517f0 100644 (file)
--- a/include/asm-ia64/agp.h
+++ b/include/asm-ia64/agp.h
@@ -19,44 +19,13 @@
 #define flush_agp_cache()              mb()
 
 /* Convert a physical address to an address suitable for the GART. */
-#ifndef CONFIG_XEN
 #define phys_to_gart(x) (x)
 #define gart_to_phys(x) (x)
-#else
-#define phys_to_gart(x) phys_to_machine_for_dma(x)
-#define gart_to_phys(x) machine_to_phys_for_dma(x)
-#endif
 
 /* GATT allocation. Returns/accepts GATT kernel virtual address. */
-#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)
-{
-       unsigned long error;
-       unsigned long ret = __get_free_pages(GFP_KERNEL, (order));
-       if (ret == 0) {
-               goto out;
-       }
-       error = xen_create_contiguous_region(ret, order, 0);
-       if (error) {
-               free_pages(ret, order);
-               ret = 0;
-       }
-out:
-       return (char*)ret;
-}
-static inline void
-free_gatt_pages(void* table, unsigned int order)
-{
-       xen_destroy_contiguous_region((unsigned long)table, order);
-       free_pages((unsigned long)table, order);
-}
-#endif /* CONFIG_XEN */
 
 #endif /* _ASM_IA64_AGP_H */