From 1863002bd306032186cb156c0560f3d62936e155 Mon Sep 17 00:00:00 2001
From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Wed, 9 Nov 2005 14:56:00 -0800
Subject: [PATCH] --- yaml --- r: 13663 b: refs/heads/master c:
 6730c3c14421b7c924d06e31bb66e0adad225547 h: refs/heads/master i:   13661:
 88a6113629689c537c4ba75768913eb7b4224223   13659:
 1094269b50b66ef95e623bfba12f4cf13e1954d2   13655:
 e4de74845419d4d805f7314c1cf4406d2dc769d6   13647:
 7d45db564c4b3022bd10f5600affeac4a646896d   13631:
 97e74a67020c764a06b6146cc97de6e7e56eeb1c v: v3

---
 [refs]                           | 2 +-
 trunk/drivers/char/agp/backend.c | 6 +++---
 trunk/drivers/char/agp/generic.c | 4 +---
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index e01c14c4e1af..9396ccf1e8a8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 969780f8079994f161de991870feba68f49fc3d7
+refs/heads/master: 6730c3c14421b7c924d06e31bb66e0adad225547
diff --git a/trunk/drivers/char/agp/backend.c b/trunk/drivers/char/agp/backend.c
index 4d5ed18dad00..27bca34b4a65 100644
--- a/trunk/drivers/char/agp/backend.c
+++ b/trunk/drivers/char/agp/backend.c
@@ -147,7 +147,7 @@ static int agp_backend_initialize(struct agp_bridge_data *bridge)
 			printk(KERN_ERR PFX "unable to get memory for scratch page.\n");
 			return -ENOMEM;
 		}
-		global_flush_tlb();
+		flush_agp_mappings();
 
 		bridge->scratch_page_real = virt_to_gart(addr);
 		bridge->scratch_page =
@@ -191,7 +191,7 @@ static int agp_backend_initialize(struct agp_bridge_data *bridge)
 	if (bridge->driver->needs_scratch_page) {
 		bridge->driver->agp_destroy_page(
 				gart_to_virt(bridge->scratch_page_real));
-		global_flush_tlb();
+		flush_agp_mappings();
 	}
 	if (got_gatt)
 		bridge->driver->free_gatt_table(bridge);
@@ -217,7 +217,7 @@ static void agp_backend_cleanup(struct agp_bridge_data *bridge)
 	    bridge->driver->needs_scratch_page) {
 		bridge->driver->agp_destroy_page(
 				gart_to_virt(bridge->scratch_page_real));
-		global_flush_tlb();
+		flush_agp_mappings();
 	}
 }
 
diff --git a/trunk/drivers/char/agp/generic.c b/trunk/drivers/char/agp/generic.c
index 19f242b50781..5567ce8d72b0 100644
--- a/trunk/drivers/char/agp/generic.c
+++ b/trunk/drivers/char/agp/generic.c
@@ -155,7 +155,7 @@ 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]));
 		}
-		global_flush_tlb();
+		flush_agp_mappings();
 	}
 	agp_free_key(curr->key);
 	vfree(curr->memory);
@@ -213,8 +213,6 @@ struct agp_memory *agp_allocate_memory(struct agp_bridge_data *bridge,
 		new->memory[i] = virt_to_gart(addr);
 		new->page_count++;
 	}
-	global_flush_tlb();
-
 	new->bridge = bridge;
 
 	flush_agp_mappings();