OSDN Git Service
(root)
/
sagit-ice-cold
/
kernel_xiaomi_msm8998.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
7a779a5
c8f8f45
)
Merge "defconfig: msm: add fastmap config on sdm660"
author
Linux Build Service Account
<lnxbuild@localhost>
Wed, 15 Feb 2017 14:11:14 +0000
(06:11 -0800)
committer
Gerrit - 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
patch
|
diff1
|
diff2
|
blob
|
history
arch/arm/configs/sdm660_defconfig
patch
|
diff1
|
diff2
|
blob
|
history
arch/arm/include/asm/cacheflush.h
patch
|
diff1
|
diff2
|
blob
|
history
arch/arm/mm/dma-mapping.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
arch/arm/configs/sdm660-perf_defconfig
index
013bada
,
4214dde
..
73c12f9
---
1
/
arch/arm/configs/sdm660-perf_defconfig
---
2
/
arch/arm/configs/sdm660-perf_defconfig
+++ b/
arch/arm/configs/sdm660-perf_defconfig
@@@
-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
diff --cc
arch/arm/configs/sdm660_defconfig
Simple merge
diff --cc
arch/arm/include/asm/cacheflush.h
Simple merge
diff --cc
arch/arm/mm/dma-mapping.c
Simple merge