diff options
| author | Jeff Garzik <[email protected]> | 2005-11-29 03:50:33 -0500 |
|---|---|---|
| committer | Jeff Garzik <[email protected]> | 2005-11-29 03:50:33 -0500 |
| commit | 2226340eb8df9c42f9fca74582d08d5117fc0cec (patch) | |
| tree | c98370844715194600b79f886dbc391633f3e470 /drivers/char/drm/drm_memory_debug.h | |
| parent | 2e06cb5859fdaeba0529806eb1bf161ffd0db201 (diff) | |
| parent | 624f54be206adf970cd8eece16446b027913e533 (diff) | |
Merge branch 'master'
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 4542353195bd..b370aca718d2 100644 --- a/drivers/char/drm/drm_memory_debug.h +++ b/drivers/char/drm/drm_memory_debug.h @@ -221,7 +221,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; |