diff options
author | Will Deacon <will.deacon@arm.com> | 2017-03-10 21:32:23 +0100 |
---|---|---|
committer | Catalin Marinas <catalin.marinas@arm.com> | 2017-03-20 17:16:59 +0100 |
commit | 02f7760e6e5c3d726cd9622749cdae17c571b9a3 (patch) | |
tree | c32de8d89af2f29b2ef15e6e4d88916d6db93427 /arch/arm64/include/asm/kvm_mmu.h | |
parent | arm64: cache: Remove support for ASID-tagged VIVT I-caches (diff) | |
download | linux-02f7760e6e5c3d726cd9622749cdae17c571b9a3.tar.xz linux-02f7760e6e5c3d726cd9622749cdae17c571b9a3.zip |
arm64: cache: Merge cachetype.h into cache.h
cachetype.h and cache.h are small and both obviously related to caches.
Merge them together to reduce clutter.
Acked-by: Mark Rutland <mark.rutland@arm.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Diffstat (limited to 'arch/arm64/include/asm/kvm_mmu.h')
-rw-r--r-- | arch/arm64/include/asm/kvm_mmu.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm64/include/asm/kvm_mmu.h b/arch/arm64/include/asm/kvm_mmu.h index 4be5773d4606..dc3624d8b9db 100644 --- a/arch/arm64/include/asm/kvm_mmu.h +++ b/arch/arm64/include/asm/kvm_mmu.h @@ -108,7 +108,7 @@ alternative_else_nop_endif #else #include <asm/pgalloc.h> -#include <asm/cachetype.h> +#include <asm/cache.h> #include <asm/cacheflush.h> #include <asm/mmu_context.h> #include <asm/pgtable.h> |