[RFC PATCH v2 06/12] drivers/xen/swiotlb-xen: update usage of address zone modifiers

[RFC PATCH v2 06/12] drivers/xen/swiotlb-xen: update usage of address zone modifiers

[Huaisheng HS1 Ye]

Use __GFP_ZONE_MASK to replace (__GFP_DMA | __GFP_HIGHMEM).

In function xen_swiotlb_alloc_coherent, it is obvious that __GFP_DMA32
is not the expecting zone type.

___GFP_DMA, ___GFP_HIGHMEM and ___GFP_DMA32 have been deleted from GFP 
bitmasks, the bottom three bits of GFP mask is reserved for storing
encoded zone number.
__GFP_DMA, __GFP_HIGHMEM and __GFP_DMA32 should not be operated with
each others by OR. 

Signed-off-by: Huaisheng Ye <yehs1@lenovo.com>
Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Cc: Boris Ostrovsky <boris.ostrovsky@oracle.com>
Cc: Juergen Gross <jgross@suse.com>
---
 drivers/xen/swiotlb-xen.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/xen/swiotlb-xen.c b/drivers/xen/swiotlb-xen.c
index 5bb72d3..00e8368 100644
--- a/drivers/xen/swiotlb-xen.c
+++ b/drivers/xen/swiotlb-xen.c
@@ -315,7 +315,7 @@ int __ref xen_swiotlb_init(int verbose, bool early)
        * machine physical layout.  We can't allocate highmem
        * because we can't return a pointer to it. 
        */
-       flags &= ~(__GFP_DMA | __GFP_HIGHMEM);
+       flags &= ~__GFP_ZONE_MASK;
 
        /* On ARM this function returns an ioremap'ped virtual address for 
         * which virt_to_phys doesn't return the corresponding physical
-- 
1.8.3.1