8 files changed, 0 insertions, 12 deletions

diff --git a/drivers/char/agp/backend.c b/drivers/char/agp/backend.c
index 832ded20fe70..2720882e66fe 100644
--- a/drivers/char/agp/backend.c
+++ b/drivers/char/agp/backend.c
@@ -147,7 +147,6 @@ static int agp_backend_initialize(struct agp_bridge_data *bridge)
                         printk(KERN_ERR PFX "unable to get memory for scratch page.\n");
                         return -ENOMEM;
                 }
-                flush_agp_mappings();
 
                 bridge->scratch_page_real = virt_to_gart(addr);
                 bridge->scratch_page =
@@ -191,7 +190,6 @@ err_out:
         if (bridge->driver->needs_scratch_page) {
                 bridge->driver->agp_destroy_page(gart_to_virt(bridge->scratch_page_real),
                                                  AGP_PAGE_DESTROY_UNMAP);
-                flush_agp_mappings();
                 bridge->driver->agp_destroy_page(gart_to_virt(bridge->scratch_page_real),
                                                  AGP_PAGE_DESTROY_FREE);
         }
@@ -219,7 +217,6 @@ static void agp_backend_cleanup(struct agp_bridge_data *bridge)
             bridge->driver->needs_scratch_page) {
                 bridge->driver->agp_destroy_page(gart_to_virt(bridge->scratch_page_real),
                                                  AGP_PAGE_DESTROY_UNMAP);
-                flush_agp_mappings();
                 bridge->driver->agp_destroy_page(gart_to_virt(bridge->scratch_page_real),
                                                  AGP_PAGE_DESTROY_FREE);
         }
diff --git a/drivers/char/agp/generic.c b/drivers/char/agp/generic.c
index 64b2f6d7059d..1a4674ce0c71 100644
--- a/drivers/char/agp/generic.c
+++ b/drivers/char/agp/generic.c
@@ -197,7 +197,6 @@ void agp_free_memory(struct agp_memory *curr)
                 for (i = 0; i < curr->page_count; i++) {
                         curr->bridge->driver->agp_destroy_page(gart_to_virt(curr->memory[i]), AGP_PAGE_DESTROY_UNMAP);
                 }
-                flush_agp_mappings();
                 for (i = 0; i < curr->page_count; i++) {
                         curr->bridge->driver->agp_destroy_page(gart_to_virt(curr->memory[i]), AGP_PAGE_DESTROY_FREE);
                 }
@@ -267,8 +266,6 @@ struct agp_memory *agp_allocate_memory(struct agp_bridge_data *bridge,
         }
         new->bridge = bridge;
 
-        flush_agp_mappings();
-
         return new;
 }
 EXPORT_SYMBOL(agp_allocate_memory);
diff --git a/include/asm-alpha/agp.h b/include/asm-alpha/agp.h
index ef855a3bc0f5..26c179135293 100644
--- a/include/asm-alpha/agp.h
+++ b/include/asm-alpha/agp.h
@@ -7,7 +7,6 @@
 
 #define map_page_into_agp(page) 
 #define unmap_page_from_agp(page) 
-#define flush_agp_mappings() 
 #define flush_agp_cache() mb()
 
 /* Convert a physical address to an address suitable for the GART. */
diff --git a/include/asm-ia64/agp.h b/include/asm-ia64/agp.h
index 4e517f0e6afa..c11fdd8ab4d7 100644
--- a/include/asm-ia64/agp.h
+++ b/include/asm-ia64/agp.h
@@ -15,7 +15,6 @@
  */
 #define map_page_into_agp(page)         /* nothing */
 #define unmap_page_from_agp(page)       /* nothing */
-#define flush_agp_mappings()            /* nothing */
 #define flush_agp_cache()               mb()
 
 /* Convert a physical address to an address suitable for the GART. */
diff --git a/include/asm-parisc/agp.h b/include/asm-parisc/agp.h
index 9f61d4eb6c01..9651660da639 100644
--- a/include/asm-parisc/agp.h
+++ b/include/asm-parisc/agp.h
@@ -9,7 +9,6 @@
 
 #define map_page_into_agp(page)         /* nothing */
 #define unmap_page_from_agp(page)       /* nothing */
-#define flush_agp_mappings()            /* nothing */
 #define flush_agp_cache()               mb()
 
 /* Convert a physical address to an address suitable for the GART. */
diff --git a/include/asm-powerpc/agp.h b/include/asm-powerpc/agp.h
index e5ccaca2f5a4..86455c4c31ee 100644
--- a/include/asm-powerpc/agp.h
+++ b/include/asm-powerpc/agp.h
@@ -6,7 +6,6 @@
 
 #define map_page_into_agp(page)
 #define unmap_page_from_agp(page)
-#define flush_agp_mappings()
 #define flush_agp_cache() mb()
 
 /* Convert a physical address to an address suitable for the GART. */
diff --git a/include/asm-sparc64/agp.h b/include/asm-sparc64/agp.h
index 58f8cb6ae767..e9fcf0e781ea 100644
--- a/include/asm-sparc64/agp.h
+++ b/include/asm-sparc64/agp.h
@@ -5,7 +5,6 @@
 
 #define map_page_into_agp(page) 
 #define unmap_page_from_agp(page) 
-#define flush_agp_mappings() 
 #define flush_agp_cache() mb()
 
 /* Convert a physical address to an address suitable for the GART. */
diff --git a/include/asm-x86/agp.h b/include/asm-x86/agp.h
index 0c309b9a5217..e4004a9f6a9a 100644
--- a/include/asm-x86/agp.h
+++ b/include/asm-x86/agp.h
@@ -14,7 +14,6 @@
 
 #define map_page_into_agp(page) set_pages_uc(page, 1)
 #define unmap_page_from_agp(page) set_pages_wb(page, 1)
-#define flush_agp_mappings() do { } while (0)
 
 /*
  * Could use CLFLUSH here if the cpu supports it. But then it would