2 files changed, 7 insertions, 1 deletions

diff --git a/drivers/char/agp/agp.h b/drivers/char/agp/agp.h
index 81e14bea54bd..395168fb17e3 100644
--- a/drivers/char/agp/agp.h
+++ b/drivers/char/agp/agp.h
@@ -30,6 +30,10 @@
 #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 eaa1a355bb32..bf239b8ecac5 100644
--- a/drivers/char/agp/generic.c
+++ b/drivers/char/agp/generic.c
@@ -274,6 +274,7 @@ 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;
@@ -1186,7 +1187,8 @@ void *agp_generic_alloc_page(struct agp_bridge_data *bridge)
         if (page == NULL)
                 return NULL;
 
-        map_page_into_agp(page);
+        /* agp_allocate_memory will do flush */
+        map_page_into_agp_noflush(page);
 
         get_page(page);
         atomic_inc(&agp_bridge->current_memory_agp);