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

This reverts commit 466ae837424dcc538b1af2a0eaf53be32edcdbe7.

diff --git a/drivers/char/agp/agp.h b/drivers/char/agp/agp.h
index 395168fb17e32f7b80269b1e8f4074dadce768b2..81e14bea54bdb8779e7b6f0cc4f468e7bb51b3a2 100644 (file)
--- 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 bf239b8ecac5ed5de00a49202adf718608d58a33..eaa1a355bb326a483b270689347fc49a80cbe05a 100644 (file)
--- 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);

diff --git a/include/asm-x86/agp.h b/include/asm-x86/agp.h
index 181b9e984b3ae82886c8bf8428b1e70c9fdc7b17..e4004a9f6a9a53fa03c7b5ce6db80809180dc703 100644 (file)
--- a/include/asm-x86/agp.h
+++ b/include/asm-x86/agp.h
@@ -15,9 +15,6 @@
 #define map_page_into_agp(page) set_pages_uc(page, 1)
 #define unmap_page_from_agp(page) set_pages_wb(page, 1)
 
-#define map_page_into_agp_noflush(page) set_pages_uc_noflush(page, 1)
-#define map_page_into_agp_global_flush() set_memory_flush_all()
-
 /*
  * Could use CLFLUSH here if the cpu supports it. But then it would
  * need to be called for each cacheline of the whole page so it may