diff options
| -rw-r--r-- | arch/x86/kernel/pci-dma.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/kernel/pci-dma.c b/arch/x86/kernel/pci-dma.c index f7d0672481fd..e5f4e9629e61 100644 --- a/arch/x86/kernel/pci-dma.c +++ b/arch/x86/kernel/pci-dma.c | |||
| @@ -97,7 +97,7 @@ void *dma_generic_alloc_coherent(struct device *dev, size_t size, | |||
| 97 | 97 | ||
| 98 | dma_mask = dma_alloc_coherent_mask(dev, flag); | 98 | dma_mask = dma_alloc_coherent_mask(dev, flag); |
| 99 | 99 | ||
| 100 | flag |= __GFP_ZERO; | 100 | flag &= ~__GFP_ZERO; |
| 101 | again: | 101 | again: |
| 102 | page = NULL; | 102 | page = NULL; |
| 103 | /* CMA can be used only in the context which permits sleeping */ | 103 | /* CMA can be used only in the context which permits sleeping */ |
| @@ -120,7 +120,7 @@ again: | |||
| 120 | 120 | ||
| 121 | return NULL; | 121 | return NULL; |
| 122 | } | 122 | } |
| 123 | 123 | memset(page_address(page), 0, size); | |
| 124 | *dma_addr = addr; | 124 | *dma_addr = addr; |
| 125 | return page_address(page); | 125 | return page_address(page); |
| 126 | } | 126 | } |
