arm64: cache: Merge cachetype.h into cache.h
authorWill Deacon <will.deacon@arm.com>
Fri, 10 Mar 2017 20:32:23 +0000 (20:32 +0000)
committerCatalin Marinas <catalin.marinas@arm.com>
Mon, 20 Mar 2017 16:16:59 +0000 (16:16 +0000)
commit02f7760e6e5c3d726cd9622749cdae17c571b9a3
treec32de8d89af2f29b2ef15e6e4d88916d6db93427
parent155433cb365ee4666bdf7c3c7bc2978b17be36a4
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>
arch/arm64/include/asm/cache.h
arch/arm64/include/asm/cachetype.h [deleted file]
arch/arm64/include/asm/kvm_mmu.h
arch/arm64/kernel/cpuinfo.c
arch/arm64/mm/flush.c