git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'akpm' (patches from Andrew)
[sfrench/cifs-2.6.git]
/
drivers
/
net
/
ethernet
/
sfc
/
rx.c
diff --git
a/drivers/net/ethernet/sfc/rx.c
b/drivers/net/ethernet/sfc/rx.c
index 8cb60513dca2105d1eabcab9d34bc8502ae2bafa..cfe76aad79ee172dca05153c58dfae1b2370066f 100644
(file)
--- a/
drivers/net/ethernet/sfc/rx.c
+++ b/
drivers/net/ethernet/sfc/rx.c
@@
-163,7
+163,7
@@
static int efx_init_rx_buffers(struct efx_rx_queue *rx_queue, bool atomic)
do {
page = efx_reuse_page(rx_queue);
if (page == NULL) {
- page = alloc_pages(__GFP_CO
LD | __GFP_CO
MP |
+ page = alloc_pages(__GFP_COMP |
(atomic ? GFP_ATOMIC : GFP_KERNEL),
efx->rx_buffer_order);
if (unlikely(page == NULL))