Merge branch 'linux-2.6'

1 files changed, 0 insertions, 3 deletions

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);