diff options
| author | Radim Krčmář <rkrcmar@redhat.com> | 2016-04-08 14:17:27 +0200 |
|---|---|---|
| committer | Radim Krčmář <rkrcmar@redhat.com> | 2016-04-08 14:17:27 +0200 |
| commit | 4a6cd3ba6fc4993f1805613098d7b032a7aa937b (patch) | |
| tree | b3f1da0eed3d73f677651feb53c3d1c87555765c /arch/arm64/include/asm/kvm_asm.h | |
| parent | 3d8e15dd6de644736916c8ba012c1cc6b356d4ba (diff) | |
| parent | 06a71a24bae57a07afee9cda6b00495347d8a448 (diff) | |
| download | linux-4a6cd3ba6fc4993f1805613098d7b032a7aa937b.tar.gz linux-4a6cd3ba6fc4993f1805613098d7b032a7aa937b.tar.bz2 linux-4a6cd3ba6fc4993f1805613098d7b032a7aa937b.zip | |
Merge tag 'kvm-arm-for-4.6-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm
KVM/ARM Fixes for v4.6-rc4
Addresses:
- Wrong indentation in the PMU code from the merge window
- A long-time bug occuring with running ntpd on the host, candidate for stable
- Properly handle (and warn about) the unsupported configuration of running on
systems with less than 40 bits of PA space
- More fixes to the PM and hotplug notifier stuff from the merge window
Diffstat (limited to 'arch/arm64/include/asm/kvm_asm.h')
| -rw-r--r-- | arch/arm64/include/asm/kvm_asm.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm64/include/asm/kvm_asm.h b/arch/arm64/include/asm/kvm_asm.h index eb7490d232a0..40a0a24e6c98 100644 --- a/arch/arm64/include/asm/kvm_asm.h +++ b/arch/arm64/include/asm/kvm_asm.h @@ -54,7 +54,7 @@ extern void __vgic_v3_init_lrs(void); extern u32 __kvm_get_mdcr_el2(void); -extern void __init_stage2_translation(void); +extern u32 __init_stage2_translation(void); #endif |