aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/char/agp/intel-agp.c
diff options
context:
space:
mode:
authorNick Piggin <npiggin@suse.de>2007-07-25 07:19:22 -0400
committerDave Airlie <airlied@redhat.com>2007-07-26 20:46:26 -0400
commita51b34593f691a0837d752a1394dcee19483c607 (patch)
tree1e87c0139aa6c5a96e73f3664e5c3856f2369c48 /drivers/char/agp/intel-agp.c
parentc99c108ac362f5cc37f79fad7e9897bd9d033bcc (diff)
agp: don't lock pages
AGP should not need to lock pages. They are not protecting any race because there is no lock_page calls, only SetPageLocked. This is causing hangs with d00806b183152af6d24f46f0c33f14162ca1262a. Signed-off-by: Nick Piggin <npiggin@suse.de> Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/char/agp/intel-agp.c')
-rw-r--r--drivers/char/agp/intel-agp.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/char/agp/intel-agp.c b/drivers/char/agp/intel-agp.c
index a1240603912c..2f319f474f70 100644
--- a/drivers/char/agp/intel-agp.c
+++ b/drivers/char/agp/intel-agp.c
@@ -213,7 +213,6 @@ static void *i8xx_alloc_pages(void)
213 } 213 }
214 global_flush_tlb(); 214 global_flush_tlb();
215 get_page(page); 215 get_page(page);
216 SetPageLocked(page);
217 atomic_inc(&agp_bridge->current_memory_agp); 216 atomic_inc(&agp_bridge->current_memory_agp);
218 return page_address(page); 217 return page_address(page);
219} 218}
@@ -229,7 +228,6 @@ static void i8xx_destroy_pages(void *addr)
229 change_page_attr(page, 4, PAGE_KERNEL); 228 change_page_attr(page, 4, PAGE_KERNEL);
230 global_flush_tlb(); 229 global_flush_tlb();
231 put_page(page); 230 put_page(page);
232 unlock_page(page);
233 __free_pages(page, 2); 231 __free_pages(page, 2);
234 atomic_dec(&agp_bridge->current_memory_agp); 232 atomic_dec(&agp_bridge->current_memory_agp);
235} 233}