diff options
| author | Shannon Zhao <shannon.zhao@linaro.org> | 2015-05-26 20:43:27 +0800 |
|---|---|---|
| committer | Shannon Zhao <shannon.zhao@linaro.org> | 2015-05-26 20:50:44 +0800 |
| commit | 7e04a8803c644b0e1d90b59da24a6e1925082730 (patch) | |
| tree | 3b3c82501cc06506f2596435365099973ca81fba /arch/arm64/include | |
| parent | a524c44bc75336d0b9d9b45ceb30e19354ff780e (diff) | |
| parent | 13253707013a08ce5a279ebd029fa10230172458 (diff) | |
Merge branch 'linux-3.14.y' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into linux-linaro-lsk-v3.14
Conflicts:
arch/arm/include/asm/kvm_mmu.h
arch/arm/kvm/mmu.c
arch/arm64/include/asm/kvm_arm.h
arch/arm64/include/asm/kvm_mmu.h
arch/arm64/kvm/sys_regs.c
virt/kvm/arm/vgic.c
Diffstat (limited to 'arch/arm64/include')
| -rw-r--r-- | arch/arm64/include/asm/kvm_mmu.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm64/include/asm/kvm_mmu.h b/arch/arm64/include/asm/kvm_mmu.h index a030d163840b..84bfe94f43c3 100644 --- a/arch/arm64/include/asm/kvm_mmu.h +++ b/arch/arm64/include/asm/kvm_mmu.h @@ -125,7 +125,6 @@ static inline bool kvm_page_empty(void *ptr) #endif #define kvm_pud_table_empty(pudp) (0) - struct kvm; #define kvm_flush_dcache_to_poc(a,l) __flush_dcache_area((a), (l)) |