summaryrefslogtreecommitdiffstats
path: root/drivers/char
diff options
context:
space:
mode:
authorJan Beulich <JBeulich@novell.com>2010-09-24 13:25:30 +0100
committerChris Wilson <chris@chris-wilson.co.uk>2010-09-24 14:22:12 +0100
commite61cb0d5fd172ab95a4501917526382f25158e83 (patch)
tree5620faa45a505e54f61d26d34f8a4b69ad6ed80c /drivers/char
parent5ceb0f9bb7bde101d8b07cb803002591dcb8c804 (diff)
downloadop-kernel-dev-e61cb0d5fd172ab95a4501917526382f25158e83.zip
op-kernel-dev-e61cb0d5fd172ab95a4501917526382f25158e83.tar.gz
some clean up to intel-gtt.c
In commit e517a5e97080bbe52857bd0d7df9b66602d53c4d the call to map_page_into_agp() got removed from intel_i830_setup_flush(), but the counterpart call from intel_i830_fini_flush() to unmap_page_from_agp() was left in place. Additionally, the page allocated here never gets its physical address used for sending to hardware, so there's no need to allocate it with GFP_DMA32. Nor is __GFP_ZERO really necessary, as the page is used only to store data to force flushing of some internal processor state. Signed-off-by: Jan Beulich <jbeulich@novell.com> Cc: Eric Anholt <eric@anholt.net> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'drivers/char')
-rw-r--r--drivers/char/agp/intel-gtt.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/char/agp/intel-gtt.c b/drivers/char/agp/intel-gtt.c
index 9a03815..0c8ff6d 100644
--- a/drivers/char/agp/intel-gtt.c
+++ b/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;
OpenPOWER on IntegriCloud