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 395168f..81e14be 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 bf239b8..eaa1a35 100644
--- a/drivers/char/agp/generic.c
+++ b/drivers/char/agp/generic.c
@@ -274,7 +274,6 @@
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 @@
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 181b9e9..e4004a9 100644
--- 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