Revert "reduce tlb/cache flush times of agpgart memory allocation"

This reverts commit 466ae837424dcc538b1af2a0eaf53be32edcdbe7.

2 files changed, 1 insertions, 7 deletions

diff --git a/drivers/char/agp/agp.h b/drivers/char/agp/agp.h
index 395168fb17e3..81e14bea54bd 100644
--- a/drivers/char/agp/agp.h
+++ b/drivers/char/agp/agp.h
@@ -30,10 +30,6 @@
 #define _AGP_BACKEND_PRIV_H 1
 
 #include <asm/agp.h>    /* for flush_agp_cache() */
-#ifndef map_page_into_agp_noflush
-#define map_page_into_agp_noflush(page) map_page_into_agp(page)
-#define map_page_into_agp_global_flush()
-#endif
 
 #define PFX "agpgart: "
 
diff --git a/drivers/char/agp/generic.c b/drivers/char/agp/generic.c
index bf239b8ecac5..eaa1a355bb32 100644
--- a/drivers/char/agp/generic.c
+++ b/drivers/char/agp/generic.c
@@ -274,7 +274,6 @@ struct agp_memory *agp_allocate_memory(struct agp_bridge_data *bridge,
                 new->memory[i] = virt_to_gart(addr);
                 new->page_count++;
         }
-        map_page_into_agp_global_flush();
         new->bridge = bridge;
 
         return new;
@@ -1187,8 +1186,7 @@ void *agp_generic_alloc_page(struct agp_bridge_data *bridge)
         if (page == NULL)
                 return NULL;
 
-        /* agp_allocate_memory will do flush */
-        map_page_into_agp_noflush(page);
+        map_page_into_agp(page);
 
         get_page(page);
         atomic_inc(&agp_bridge->current_memory_agp);