diff options
| author | Will Deacon <will.deacon@arm.com> | 2018-03-27 14:04:51 +0300 |
|---|---|---|
| committer | Will Deacon <will.deacon@arm.com> | 2018-03-27 14:04:51 +0300 |
| commit | 3f251cf0abec2afb6eca67f71380670dd55bdebe (patch) | |
| tree | e2ebead8eb4ed13267839d8710749154d77545d7 /arch/arm64/Kconfig | |
| parent | 12eb369125abe92bfc55e9ce198200f5807b63ff (diff) | |
| download | linux-3f251cf0abec2afb6eca67f71380670dd55bdebe.tar.xz | |
Revert "arm64: Revert L1_CACHE_SHIFT back to 6 (64-byte cache line size)"
This reverts commit 1f85b42a691cd8329ba82dbcaeec80ac1231b32a.
The internal dma-direct.h API has changed in -next, which collides with
us trying to use it to manage non-coherent DMA devices on systems with
unreasonably large cache writeback granules.
This isn't at all trivial to resolve, so revert our changes for now and
we can revisit this after the merge window. Effectively, this just
restores our behaviour back to that of 4.16.
Signed-off-by: Will Deacon <will.deacon@arm.com>
Diffstat (limited to 'arch/arm64/Kconfig')
| -rw-r--r-- | arch/arm64/Kconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig index fd74c5830232..d4d53c87267e 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@ -17,7 +17,6 @@ config ARM64 select ARCH_HAS_GIGANTIC_PAGE if (MEMORY_ISOLATION && COMPACTION) || CMA select ARCH_HAS_KCOV select ARCH_HAS_MEMBARRIER_SYNC_CORE - select ARCH_HAS_PHYS_TO_DMA select ARCH_HAS_SET_MEMORY select ARCH_HAS_SG_CHAIN select ARCH_HAS_STRICT_KERNEL_RWX |