OSDN Git Service

Merge "defconfig: msm: add fastmap config on sdm660"
authorLinux Build Service Account <lnxbuild@localhost>
Wed, 15 Feb 2017 14:11:14 +0000 (06:11 -0800)
committerGerrit - the friendly Code Review server <code-review@localhost>
Wed, 15 Feb 2017 14:11:13 +0000 (06:11 -0800)
1  2 
arch/arm/configs/sdm660-perf_defconfig
arch/arm/configs/sdm660_defconfig
arch/arm/include/asm/cacheflush.h
arch/arm/mm/dma-mapping.c

@@@ -498,10 -488,8 +498,11 @@@ CONFIG_MSM_MMCC_660=
  CONFIG_CLOCK_CPU_OSM=y
  CONFIG_QCOM_MDSS_PLL=y
  CONFIG_REMOTE_SPINLOCK_MSM=y
+ CONFIG_IOMMU_IO_PGTABLE_FAST=y
  CONFIG_ARM_SMMU=y
 +CONFIG_IOMMU_DEBUG=y
 +CONFIG_IOMMU_DEBUG_TRACKING=y
 +CONFIG_IOMMU_TESTS=y
  CONFIG_QCOM_COMMON_LOG=y
  CONFIG_MSM_SMEM=y
  CONFIG_QPNP_HAPTIC=y
Simple merge
Simple merge
Simple merge