From 03cddd69fb0f0453cbea560f1949224ffd23b70f Mon Sep 17 00:00:00 2001
From: Ingo Molnar <mingo@elte.hu>
Date: Thu, 21 Aug 2008 13:46:25 +0200
Subject: [PATCH] --- yaml --- r: 112526 b: refs/heads/master c:
 9326d61bf64c4293f834e86c11f52db5be9798d6 h: refs/heads/master v: v3

---
 [refs]                           | 2 +-
 trunk/drivers/char/agp/agp.h     | 4 ----
 trunk/drivers/char/agp/generic.c | 4 +---
 trunk/include/asm-x86/agp.h      | 3 ---
 4 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/[refs] b/[refs]
index d301b02862de..509ceefcdc9a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5843d9a4d0ba89719916c8f07fc9c57b7126be6d
+refs/heads/master: 9326d61bf64c4293f834e86c11f52db5be9798d6
diff --git a/trunk/drivers/char/agp/agp.h b/trunk/drivers/char/agp/agp.h
index 395168fb17e3..81e14bea54bd 100644
--- a/trunk/drivers/char/agp/agp.h
+++ b/trunk/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/trunk/drivers/char/agp/generic.c b/trunk/drivers/char/agp/generic.c
index bf239b8ecac5..eaa1a355bb32 100644
--- a/trunk/drivers/char/agp/generic.c
+++ b/trunk/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/trunk/include/asm-x86/agp.h b/trunk/include/asm-x86/agp.h
index 181b9e984b3a..e4004a9f6a9a 100644
--- a/trunk/include/asm-x86/agp.h
+++ b/trunk/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