diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-23 23:10:47 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-23 23:10:47 -0800 |
| commit | 33bc227e4e48ddadcf2eacb381c19df338f0a6c8 (patch) | |
| tree | 8671830606ba42f4c68e08eb75d84172964b280e /drivers/char/drm/drm_memory_debug.h | |
| parent | 569cfaadb0ea21bfcedac85dbc5147b4a9ed42d2 (diff) | |
| parent | 7655f493b74f3048c02458bc32cd0b144f7b394f (diff) | |
Merge branch 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6
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 4542353195b..b370aca718d 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; |