diff options
| author |   Dave Airlie <airlied@starflyer.(none)> | 2006-01-03 18:18:01 +1100 |
|---|---|---|
| committer |   Dave Airlie <airlied@linux.ie> | 2006-01-03 18:18:01 +1100 |
| commit | 97f2aab6698f3ab2552c41c1024a65ffd0763a6d (patch) | |
| tree | bb6e3b2949459f54f884c710fc74d40eef00d834 /drivers/char/drm/drm_memory.c | |
| parent | drm: major update from CVS for radeon and core (diff) | |
| parent | Linux v2.6.15 (diff) | |
| download | linux-dev-97f2aab6698f3ab2552c41c1024a65ffd0763a6d.tar.xz linux-dev-97f2aab6698f3ab2552c41c1024a65ffd0763a6d.zip | |
drm: merge in Linus mainline
Diffstat (limited to 'drivers/char/drm/drm_memory.c')
| -rw-r--r-- | drivers/char/drm/drm_memory.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/drm/drm_memory.c b/drivers/char/drm/drm_memory.c index 7438741c29e9..8074771e348f 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) 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; |