---

yaml --- r: 218101 b: refs/heads/master c: e61cb0d h: refs/heads/master i: 218099: f67f2a0 v: v3
git-mirror · Sep 24, 2010 · 6ff62fa · 6ff62fa
1 parent beaaf08
commit 6ff62fa
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5ceb0f9bb7bde101d8b07cb803002591dcb8c804
+refs/heads/master: e61cb0d5fd172ab95a4501917526382f25158e83
diff --git a/trunk/drivers/char/agp/intel-gtt.c b/trunk/drivers/char/agp/intel-gtt.c
@@ -814,7 +814,6 @@ static void i830_cleanup(void)
 {
 	kunmap(intel_private.i8xx_page);
 	intel_private.i8xx_flush_page = NULL;
-	unmap_page_from_agp(intel_private.i8xx_page);
 
 	__free_page(intel_private.i8xx_page);
 	intel_private.i8xx_page = NULL;
@@ -826,7 +825,7 @@ static void intel_i830_setup_flush(void)
 	if (intel_private.i8xx_page)
 		return;
 
-	intel_private.i8xx_page = alloc_page(GFP_KERNEL | __GFP_ZERO | GFP_DMA32);
+	intel_private.i8xx_page = alloc_page(GFP_KERNEL);
 	if (!intel_private.i8xx_page)
 		return;