diff options
| author | Steve French <sfrench@us.ibm.com> | 2009-04-20 15:59:09 -0400 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2009-04-20 15:59:09 -0400 |
| commit | cbb7fe129bb2b836083ebcc256c43faff4b48cc2 (patch) | |
| tree | 65998c06e712be5f7cb72543a7c0cc2d0b1b4459 /drivers/char/agp/generic.c | |
| parent | 7b0c8fcff47a885743125dd843db64af41af5a61 (diff) | |
| parent | a939b96cccdb65df80a52447ec8e4a6d79c56dbb (diff) | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/char/agp/generic.c')
| -rw-r--r-- | drivers/char/agp/generic.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/char/agp/generic.c b/drivers/char/agp/generic.c index 10d6cbd7c05e..2224b762b7fb 100644 --- a/drivers/char/agp/generic.c +++ b/drivers/char/agp/generic.c | |||
| @@ -1226,7 +1226,7 @@ int agp_generic_alloc_pages(struct agp_bridge_data *bridge, struct agp_memory *m | |||
| 1226 | int i, ret = -ENOMEM; | 1226 | int i, ret = -ENOMEM; |
| 1227 | 1227 | ||
| 1228 | for (i = 0; i < num_pages; i++) { | 1228 | for (i = 0; i < num_pages; i++) { |
| 1229 | page = alloc_page(GFP_KERNEL | GFP_DMA32); | 1229 | page = alloc_page(GFP_KERNEL | GFP_DMA32 | __GFP_ZERO); |
| 1230 | /* agp_free_memory() needs gart address */ | 1230 | /* agp_free_memory() needs gart address */ |
| 1231 | if (page == NULL) | 1231 | if (page == NULL) |
| 1232 | goto out; | 1232 | goto out; |
| @@ -1257,7 +1257,7 @@ void *agp_generic_alloc_page(struct agp_bridge_data *bridge) | |||
| 1257 | { | 1257 | { |
| 1258 | struct page * page; | 1258 | struct page * page; |
| 1259 | 1259 | ||
| 1260 | page = alloc_page(GFP_KERNEL | GFP_DMA32); | 1260 | page = alloc_page(GFP_KERNEL | GFP_DMA32 | __GFP_ZERO); |
| 1261 | if (page == NULL) | 1261 | if (page == NULL) |
| 1262 | return NULL; | 1262 | return NULL; |
| 1263 | 1263 | ||