From 6ff62fa62a144edb5e75a580bbf50e19f98f994b Mon Sep 17 00:00:00 2001 From: Jan Beulich Date: Fri, 24 Sep 2010 13:25:30 +0100 Subject: [PATCH] --- yaml --- r: 218101 b: refs/heads/master c: e61cb0d5fd172ab95a4501917526382f25158e83 h: refs/heads/master i: 218099: f67f2a00449279e324d91024ad225e6cde052b95 v: v3 --- [refs] | 2 +- trunk/drivers/char/agp/intel-gtt.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index a0eda592744c..0f622eff288a 100644 --- 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 index 9a03815483c7..0c8ff6d8824b 100644 --- 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;