From 1db7e0d1371e3124bc24b15d1aacfead33cf51fa Mon Sep 17 00:00:00 2001
From: Linus Torvalds <torvalds@woody.osdl.org>
Date: Wed, 22 Nov 2006 14:55:29 -0800
Subject: [PATCH] --- yaml --- r: 41055 b: refs/heads/master c:
 66c669baa7d70b8d135da67f36c8dba12cea71b8 h: refs/heads/master i:   41053:
 a6bd12338173c1ced4f2870ef0f0081c6fb6427d   41051:
 c41f250a9ea89653c1db178b20be2e6c0827a1f1   41047:
 96d6f733acd0191c2b298eb42049d7fad15d068f   41039:
 1fcea4bec63d93514849b5898aa61f934e70306c   41023:
 903f660ce11a9c6e80db880d7d219189f49eddb8 v: v3

---
 [refs]                             | 2 +-
 trunk/drivers/char/agp/generic.c   | 2 +-
 trunk/drivers/char/agp/intel-agp.c | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 66f5793cc6aa..1554a01a5634 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7d915a38985d2826acbdc9dc9cca8a93e23e5278
+refs/heads/master: 66c669baa7d70b8d135da67f36c8dba12cea71b8
diff --git a/trunk/drivers/char/agp/generic.c b/trunk/drivers/char/agp/generic.c
index c39200161688..5ff457b41efb 100644
--- a/trunk/drivers/char/agp/generic.c
+++ b/trunk/drivers/char/agp/generic.c
@@ -1054,7 +1054,7 @@ void *agp_generic_alloc_page(struct agp_bridge_data *bridge)
 {
 	struct page * page;
 
-	page = alloc_page(GFP_KERNEL);
+	page = alloc_page(GFP_KERNEL | GFP_DMA32);
 	if (page == NULL)
 		return NULL;
 
diff --git a/trunk/drivers/char/agp/intel-agp.c b/trunk/drivers/char/agp/intel-agp.c
index aceece71a85d..555b3a8ab49c 100644
--- a/trunk/drivers/char/agp/intel-agp.c
+++ b/trunk/drivers/char/agp/intel-agp.c
@@ -169,7 +169,7 @@ static void *i8xx_alloc_pages(void)
 {
 	struct page * page;
 
-	page = alloc_pages(GFP_KERNEL, 2);
+	page = alloc_pages(GFP_KERNEL | GFP_DMA32, 2);
 	if (page == NULL)
 		return NULL;