diff options
| author | Will Deacon <will@kernel.org> | 2022-07-25 10:56:23 +0100 |
|---|---|---|
| committer | Will Deacon <will@kernel.org> | 2022-07-25 10:56:23 +0100 |
| commit | 84d8857af43a9d4289c53955f4d221ebda548b97 (patch) | |
| tree | 519114c6a4f8f36bf571cda6ad5eab798259aece /arch/arm64/Kconfig | |
| parent | ee8b00a956e104e7cf52bb138ab597bf32ec46fc (diff) | |
| parent | 893dea9ccd08dab924839354aba21d4ed7a9abc0 (diff) | |
| download | linux-84d8857af43a9d4289c53955f4d221ebda548b97.tar.bz2 | |
Merge branch 'for-next/ioremap' into for-next/core
* for-next/ioremap:
arm64: Add HAVE_IOREMAP_PROT support
arm64: mm: Convert to GENERIC_IOREMAP
mm: ioremap: Add ioremap/iounmap_allowed()
mm: ioremap: Setup phys_addr of struct vm_struct
mm: ioremap: Use more sensible name in ioremap_prot()
ARM: mm: kill unused runtime hook arch_iounmap()
Diffstat (limited to 'arch/arm64/Kconfig')
| -rw-r--r-- | arch/arm64/Kconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig index a42c1e3e7271..78607fe5f0f8 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@ -126,6 +126,7 @@ config ARM64 select GENERIC_CPU_VULNERABILITIES select GENERIC_EARLY_IOREMAP select GENERIC_IDLE_POLL_SETUP + select GENERIC_IOREMAP select GENERIC_IRQ_IPI select GENERIC_IRQ_PROBE select GENERIC_IRQ_SHOW @@ -188,6 +189,7 @@ config ARM64 select HAVE_FUNCTION_GRAPH_TRACER select HAVE_GCC_PLUGINS select HAVE_HW_BREAKPOINT if PERF_EVENTS + select HAVE_IOREMAP_PROT select HAVE_IRQ_TIME_ACCOUNTING select HAVE_KVM select HAVE_NMI |