git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
drm: merge in Linus mainline
[safe/jmp/linux-2.6]
/
drivers
/
char
/
drm
/
drm_memory_debug.h
diff --git
a/drivers/char/drm/drm_memory_debug.h
b/drivers/char/drm/drm_memory_debug.h
index
706b752
..
e84605f
100644
(file)
--- a/
drivers/char/drm/drm_memory_debug.h
+++ b/
drivers/char/drm/drm_memory_debug.h
@@
-220,7
+220,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;