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_ttm.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_ttm.c')
| -rw-r--r-- | linux-core/drm_ttm.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/linux-core/drm_ttm.c b/linux-core/drm_ttm.c index 931972af..1c9b1cf7 100644 --- a/linux-core/drm_ttm.c +++ b/linux-core/drm_ttm.c @@ -193,7 +193,7 @@ int drm_destroy_ttm(drm_ttm_t * ttm) * End debugging. */ - drm_free_gatt_pages(*cur_page, 0); + __free_page(*cur_page); drm_free_memctl(PAGE_SIZE); --bm->cur_pages; } @@ -225,7 +225,7 @@ static int drm_ttm_populate(drm_ttm_t * ttm) if (drm_alloc_memctl(PAGE_SIZE)) { return -ENOMEM; } - page = drm_alloc_gatt_pages(0); + page = alloc_page(GFP_KERNEL | __GFP_ZERO | GFP_DMA32); if (!page) { drm_free_memctl(PAGE_SIZE); return -ENOMEM; |