diff options
| author | Dave Airlie <airlied@starflyer.(none)> | 2006-01-03 10:18:01 +0300 |
|---|---|---|
| committer | Dave Airlie <airlied@linux.ie> | 2006-01-03 10:18:01 +0300 |
| commit | 97f2aab6698f3ab2552c41c1024a65ffd0763a6d (patch) | |
| tree | bb6e3b2949459f54f884c710fc74d40eef00d834 /drivers/char/drm/drm_memory_debug.h | |
| parent | d985c1088146607532093d9eaaaf99758f6a4d21 (diff) | |
| parent | 88026842b0a760145aa71d69e74fbc9ec118ca44 (diff) | |
| download | linux-97f2aab6698f3ab2552c41c1024a65ffd0763a6d.tar.xz | |
drm: merge in Linus mainline
Diffstat (limited to 'drivers/char/drm/drm_memory_debug.h')
| -rw-r--r-- | drivers/char/drm/drm_memory_debug.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/drm/drm_memory_debug.h b/drivers/char/drm/drm_memory_debug.h index 706b75251ea1..e84605fc54af 100644 --- a/drivers/char/drm/drm_memory_debug.h +++ b/drivers/char/drm/drm_memory_debug.h @@ -220,7 +220,7 @@ unsigned long drm_alloc_pages (int order, int area) { } spin_unlock(&drm_mem_lock); - address = __get_free_pages(GFP_KERNEL, order); + address = __get_free_pages(GFP_KERNEL|__GFP_COMP, order); if (!address) { spin_lock(&drm_mem_lock); ++drm_mem_stats[area].fail_count; |