diff options
author | Will Deacon <will@kernel.org> | 2021-10-29 12:25:19 +0100 |
---|---|---|
committer | Will Deacon <will@kernel.org> | 2021-10-29 12:25:19 +0100 |
commit | 16c200e0404510c416ea7348a6a1dbe9c2d262e5 (patch) | |
tree | d90a809724dc41298e0eedf2ad86dfc649bc7227 /arch/arm64/Kconfig | |
parent | bd334dd7def6debd1c318f57a539242c14c43bb9 (diff) | |
parent | 3de360c3fdb34fbdbaf6da3af94367d3fded95d3 (diff) | |
download | linux-16c200e0404510c416ea7348a6a1dbe9c2d262e5.tar.gz linux-16c200e0404510c416ea7348a6a1dbe9c2d262e5.tar.bz2 linux-16c200e0404510c416ea7348a6a1dbe9c2d262e5.zip |
Merge branch 'for-next/pfn-valid' into for-next/core
* for-next/pfn-valid:
arm64/mm: drop HAVE_ARCH_PFN_VALID
dma-mapping: remove bogus test for pfn_valid from dma_map_resource
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 d340b28eb2fb..e63c033243e2 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@ -154,7 +154,6 @@ config ARM64 select HAVE_ARCH_KGDB select HAVE_ARCH_MMAP_RND_BITS select HAVE_ARCH_MMAP_RND_COMPAT_BITS if COMPAT - select HAVE_ARCH_PFN_VALID select HAVE_ARCH_PREL32_RELOCATIONS select HAVE_ARCH_RANDOMIZE_KSTACK_OFFSET select HAVE_ARCH_SECCOMP_FILTER |