projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild
[cascardo/linux.git]
/
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
4542353
..
b370aca
100644
(file)
--- 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;