diff options
| author | Dave Airlie <airlied@starflyer.(none)> | 2005-11-23 06:09:13 -0500 |
|---|---|---|
| committer | Dave Airlie <airlied@linux.ie> | 2005-11-23 06:09:13 -0500 |
| commit | c41f47121d8bf44b886ef2039779dab8c1e3a25f (patch) | |
| tree | 98fa0962eeec797d266b5936122e52d96839c2ec | |
| parent | bd07ed2b4d7071716c09895e19849e8b04991656 (diff) | |
drm: add __GFP_COMP to the drm_alloc_pages
The DRM only uses drm_alloc_pages for non-SG PCI cards using DRM.
Signed-off-by: Hugh Dickins <hugh@veritas.com>
Signed-off-by: Dave Airlie <airlied@linux.ie>
| -rw-r--r-- | drivers/char/drm/drm_memory.c | 2 | ||||
| -rw-r--r-- | drivers/char/drm/drm_memory_debug.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/char/drm/drm_memory.c b/drivers/char/drm/drm_memory.c index 2c74155aa84f..abef2acf99f5 100644 --- a/drivers/char/drm/drm_memory.c +++ b/drivers/char/drm/drm_memory.c | |||
| @@ -95,7 +95,7 @@ unsigned long drm_alloc_pages(int order, int area) | |||
| 95 | unsigned long addr; | 95 | unsigned long addr; |
| 96 | unsigned int sz; | 96 | unsigned int sz; |
| 97 | 97 | ||
| 98 | address = __get_free_pages(GFP_KERNEL, order); | 98 | address = __get_free_pages(GFP_KERNEL|__GFP_COMP, order); |
| 99 | if (!address) | 99 | if (!address) |
| 100 | return 0; | 100 | return 0; |
| 101 | 101 | ||
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) { | |||
| 221 | } | 221 | } |
| 222 | spin_unlock(&DRM(mem_lock)); | 222 | spin_unlock(&DRM(mem_lock)); |
| 223 | 223 | ||
| 224 | address = __get_free_pages(GFP_KERNEL, order); | 224 | address = __get_free_pages(GFP_KERNEL|__GFP_COMP, order); |
| 225 | if (!address) { | 225 | if (!address) { |
| 226 | spin_lock(&DRM(mem_lock)); | 226 | spin_lock(&DRM(mem_lock)); |
| 227 | ++DRM(mem_stats)[area].fail_count; | 227 | ++DRM(mem_stats)[area].fail_count; |
