diff options
| author | Keith Packard <keithp@neko.keithp.com> | 2007-01-07 22:37:40 -0800 |
|---|---|---|
| committer | Keith Packard <keithp@neko.keithp.com> | 2007-01-07 22:37:40 -0800 |
| commit | c5aaf7648df82665851c9e67f5509b427ca34c8e (patch) | |
| tree | 55b317738a99097cb02ba6a736b9ef20de6b34f3 /linux-core/drm_compat.c | |
| parent | 63c0f3946056d044b7c5688fa5cb670782212c77 (diff) | |
| parent | d0080d71b9f3df0d4f743324b7e8f1ce580bdcaf (diff) | |
Merge branch 'master' into crestline
Conflicts:
shared-core/i915_drm.h
Whitespace change only
Diffstat (limited to 'linux-core/drm_compat.c')
| -rw-r--r-- | linux-core/drm_compat.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/linux-core/drm_compat.c b/linux-core/drm_compat.c index b466f8bd..6bb58424 100644 --- a/linux-core/drm_compat.c +++ b/linux-core/drm_compat.c @@ -251,7 +251,8 @@ struct page *drm_vm_ttm_nopage(struct vm_area_struct *vma, page = NOPAGE_OOM; goto out; } - page = ttm->pages[page_offset] = drm_alloc_gatt_pages(0); + page = ttm->pages[page_offset] = + alloc_page(GFP_KERNEL | __GFP_ZERO | GFP_DMA32); if (!page) { drm_free_memctl(PAGE_SIZE); page = NOPAGE_OOM; |