From daf38acfd3f17d3befdf9243907caf1a8ad7b35b Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Wed, 23 Nov 2005 22:09:13 +1100 Subject: [PATCH] --- yaml --- r: 14679 b: refs/heads/master c: c41f47121d8bf44b886ef2039779dab8c1e3a25f h: refs/heads/master i: 14677: 16a19b00ee13251f202a5f2692c58f2fbefe5db1 14675: 332cc66891737e52533942b4768ad7b9ca8feaa2 14671: e1f1da95587f61652e25580e3956e526948db6c5 v: v3 --- [refs] | 2 +- trunk/drivers/char/drm/drm_memory.c | 2 +- trunk/drivers/char/drm/drm_memory_debug.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index c4be1c5b28fa..8f00b9156b72 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bd07ed2b4d7071716c09895e19849e8b04991656 +refs/heads/master: c41f47121d8bf44b886ef2039779dab8c1e3a25f diff --git a/trunk/drivers/char/drm/drm_memory.c b/trunk/drivers/char/drm/drm_memory.c index 2c74155aa84f..abef2acf99f5 100644 --- a/trunk/drivers/char/drm/drm_memory.c +++ b/trunk/drivers/char/drm/drm_memory.c @@ -95,7 +95,7 @@ unsigned long drm_alloc_pages(int order, int area) unsigned long addr; unsigned int sz; - address = __get_free_pages(GFP_KERNEL, order); + address = __get_free_pages(GFP_KERNEL|__GFP_COMP, order); if (!address) return 0; diff --git a/trunk/drivers/char/drm/drm_memory_debug.h b/trunk/drivers/char/drm/drm_memory_debug.h index 4542353195bd..b370aca718d2 100644 --- a/trunk/drivers/char/drm/drm_memory_debug.h +++ b/trunk/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;