diff options
| author | Srinivas Kandagatla <srinivas.kandagatla@linaro.org> | 2015-11-18 10:28:32 +0000 |
|---|---|---|
| committer | Srinivas Kandagatla <srinivas.kandagatla@linaro.org> | 2015-11-18 10:28:32 +0000 |
| commit | 07f79e494316d2983ab5a6b9ff7878048bc1e52e (patch) | |
| tree | e275a8411caf78856061cd43040316210be97a0d /include | |
| parent | b2b1e6af6c7faff9fb085532e6eeba90220f2c5c (diff) | |
| parent | ca9ecdd3d9d9cb72772692bf869ac649b9a4547b (diff) | |
Merge branch 'tracking-qcomlt-arm64' into integration-linux-qcomlt
* tracking-qcomlt-arm64: (31 commits)
defconfig: bt: Disable old SMD TTY for BT and enable new HCI BT.
arm64: dma-mapping: map sg lists into the SMMU as virtually contiguous
arm64: dma-mapping: fix DMA_ATTR_STRONGLY_ORDERED in __get_dma_pgprot
arm64: mm: Fix a bug in iommu dma-mapping
arm64: dma-mapping: add support for IOMMU mapper
arm64: Add support for DMA_ATTR_STRONGLY_ORDERED
arm: Add option to skip buffer zeroing
common: DMA-mapping: Add strongly ordered memory attribute
arm64: defconfig: add missing QCOM specific configs
defconfig: add tsens and spmi regulator support
arm64: defconfig: Enable drivers for WCNSS
arm64: defconfig: qcom: enable iommu v1 in defconfig
arm64: defconfig: Enable CPU frequency scaling
arm64: defconfig: Enable CPR driver
arm64: defconfig: Enable SPMI regulator driver
arm64: defconfig: Enable A53 CPU clock
arm64: defconfig: Clean-up defconfig with savedefconfig
arm64: defconfig: remove 8064 rpm clock controller selection.
arm64: defconfig: Enable LED drivers
arm64: Enable Qualcomm SMEM, RPM, and SMD drivers
...
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/dma-attrs.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/dma-attrs.h b/include/linux/dma-attrs.h index c8e1831d7572..eb1b9d727f39 100644 --- a/include/linux/dma-attrs.h +++ b/include/linux/dma-attrs.h @@ -18,6 +18,8 @@ enum dma_attr { DMA_ATTR_NO_KERNEL_MAPPING, DMA_ATTR_SKIP_CPU_SYNC, DMA_ATTR_FORCE_CONTIGUOUS, + DMA_ATTR_STRONGLY_ORDERED, + DMA_ATTR_SKIP_ZEROING, DMA_ATTR_MAX, }; |