Revert "cnic: don't pass bogus GFP_ flags to dma_alloc_coherent"

JIRA: https://issues.redhat.com/browse/RHEL-2542
Upstream Status: RHEL Only

This reverts commit f7eaf7f.

bnx2i/cnic currently fails to properly mmap its dma_alloc_coherent
buffers through a uio interface without being able to allocate compound
pages.  Revert this until we can get a better cnic fix.

Signed-off-by: Chris Leech <cleech@redhat.com>

Author: cleech

drivers/net/ethernet/broadcom/cnic.c

@@ -1027,14 +1027,16 @@ static int __cnic_alloc_uio_rings(struct cnic_uio_dev *udev, int pages)
 
 	udev->l2_ring_size = pages * CNIC_PAGE_SIZE;
 	udev->l2_ring = dma_alloc_coherent(&udev->pdev->dev, udev->l2_ring_size,
-					   &udev->l2_ring_map, GFP_KERNEL);
+					   &udev->l2_ring_map,
+					   GFP_KERNEL | __GFP_COMP);
 	if (!udev->l2_ring)
 		return -ENOMEM;
 
 	udev->l2_buf_size = (cp->l2_rx_ring_size + 1) * cp->l2_single_buf_size;
 	udev->l2_buf_size = CNIC_PAGE_ALIGN(udev->l2_buf_size);
 	udev->l2_buf = dma_alloc_coherent(&udev->pdev->dev, udev->l2_buf_size,
-					  &udev->l2_buf_map, GFP_KERNEL);
+					  &udev->l2_buf_map,
+					  GFP_KERNEL | __GFP_COMP);
 	if (!udev->l2_buf) {
 		__cnic_free_uio_rings(udev);
 		return -ENOMEM;