diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-09 17:56:00 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-09 17:56:00 -0500 |
commit | 6730c3c14421b7c924d06e31bb66e0adad225547 (patch) | |
tree | e46448ce7930756b6ca2fb45104bc95b874c6a39 /drivers/char/agp/generic.c | |
parent | 969780f8079994f161de991870feba68f49fc3d7 (diff) |
Fix AGP compile on non-x86 architectures
AGP shouldn't use "global_flush_tlb()" to flush the AGP mappings, that i
spurely an x86'ism. The proper AGP mapping flusher that should be used
is "flush_agp_mappings()", which on x86 obviously happens to do a global
TLB flush.
This makes AGP (or at least the config _I_ happen to use) compile again
on ppc64.
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/char/agp/generic.c')
-rw-r--r-- | drivers/char/agp/generic.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/char/agp/generic.c b/drivers/char/agp/generic.c index 19f242b50781..5567ce8d72b0 100644 --- a/drivers/char/agp/generic.c +++ b/drivers/char/agp/generic.c | |||
@@ -155,7 +155,7 @@ void agp_free_memory(struct agp_memory *curr) | |||
155 | for (i = 0; i < curr->page_count; i++) { | 155 | for (i = 0; i < curr->page_count; i++) { |
156 | curr->bridge->driver->agp_destroy_page(gart_to_virt(curr->memory[i])); | 156 | curr->bridge->driver->agp_destroy_page(gart_to_virt(curr->memory[i])); |
157 | } | 157 | } |
158 | global_flush_tlb(); | 158 | flush_agp_mappings(); |
159 | } | 159 | } |
160 | agp_free_key(curr->key); | 160 | agp_free_key(curr->key); |
161 | vfree(curr->memory); | 161 | vfree(curr->memory); |
@@ -213,8 +213,6 @@ struct agp_memory *agp_allocate_memory(struct agp_bridge_data *bridge, | |||
213 | new->memory[i] = virt_to_gart(addr); | 213 | new->memory[i] = virt_to_gart(addr); |
214 | new->page_count++; | 214 | new->page_count++; |
215 | } | 215 | } |
216 | global_flush_tlb(); | ||
217 | |||
218 | new->bridge = bridge; | 216 | new->bridge = bridge; |
219 | 217 | ||
220 | flush_agp_mappings(); | 218 | flush_agp_mappings(); |